Merge "Fix bug with cancelled drag" into nyc-dev
am: df89cd1

* commit 'df89cd1b39bcebdd37b29185c76aa005863e8c2f':
  Fix bug with cancelled drag

Change-Id: I9ebb6f5252349cb5ec7e423ee18f49d6c34c64e0