Merge "Changes to support MediaProvider refactoring"