Merge "Revert "Verify URI permissions in MediaMetadata"" into tm-dev