Merge "Add media perms to DefaultPermissionGrantPolicy" into tm-dev