Merge "Fix for 5156702 Rotate video output for thumbnails and export"