Merge "Prevent pilfering of resize events." into main