Merge "Reconcile MediaStore with MediaMetadataRetriever."