Merge "Fix AuthContainerViewTest failing with ConstraintBp Enabled" into main