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

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