Merge "IMediaMetadataRetriever: Remove implicit display size resize logic" into oc-mr1-dev