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

* commit '19174ceb57102ae5f1b80e0df4f2e83d5f8a196b':
  SF: Swap w/h when capturing rotated screenshots