am 270bcaa9: Merge "Fix for 5156702 Rotate video output for thumbnails and export"

* commit '270bcaa9d1b7e6cef723532692d82bb231ac7137':
  Fix for 5156702 Rotate video output for thumbnails and export