Merge commit '38ed7d7701514ee7127d0430e952930854608c4f' * commit '38ed7d7701514ee7127d0430e952930854608c4f': * Adjust canvas size under compatibility mode.