Merge "MediaProviderWrapper: rename internal function to follow convention"