Merge "SF: Swap w/h when capturing rotated screenshots"