Merge "Set windowOptOutEdgeToEdgeEnforcement for ControlsActivity" into main