Merge "Update mediaprovider owners with new team members" into main