Merge "[Flag cleanup] fix_drag_pointer_when_ending_drag" into main