Merge "Remove extra checks for content protection policy, add to lists" into main