Merge "Fix windowless surface being removed too early" into main