Merge "Fix OverrideChildren surfacecontrol test" into main