Merge "Take content protection ownership" into main