Merge changes I907b231f,I6a0ac353 into main

* changes:
  Avoiding conflicts with multiple MultiPointerDraggables
  Refactor detectDragGestures in MultiPointerDraggable