Merge "Clear events when ACTION_CANCEL is present" into qt-dev am: cdf3e2905a
am: 5ecf5b0340

Change-Id: I46d0235695d050f65f809040417bbad76f6e716e