Fix the screenshot orientation only when it's not already UIImageOrientationUp
Merge remote-tracking branch 'origin/screenshot_orientation'