Merge "Clean up ex-media team members from OWNERS" into main