am 430f5f5a: am 127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"

* commit '430f5f5a6203cf6a4d688bc59a7082eb517533e3':
  SF: Swap w/h when capturing rotated screenshots