Merge changes I3a0c6658,Ibebeb747 into main

* changes:
  Small cleanup in DragState and clarify x, y coordinate space
  Send unhandled drop event with in-display-space x, y coordinates