Merge "Onboard content protection flags" into main