Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev