Merge "Verify windowing mode and bounds when apply overrides" into main