am dab85aa7: am 026df005: Merge "Fixing bug where drag would sometimes get cancelled inadvertently" into ics-mr1

* commit 'dab85aa7274a1aa37a3384f70780fdaa034b7ae5':
  Fixing bug where drag would sometimes get cancelled inadvertently