Merge "Make sure to not call DragOver when the drag is still under PreDrag" into main