Merge "Update drag resizing to prioritize close button." into main