Merge commit 'e96bd1291482175ac1740780cbd0f42bbe9ff746' * commit 'e96bd1291482175ac1740780cbd0f42bbe9ff746': * scale surface view's canvas