Merge "Fixing bug where drag would sometimes get cancelled inadvertently" into ics-mr1