Merge "Remove duplicate coordinate rotation code for screenshots."