Merge changes from topic 'dragon-drop' into nyc-dev

* changes:
  Clean up after a drop event.
  Enable dragon drop for touch.