Merge "MediaMetadataRetriever: add static lock for image extraction" into main