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

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