Merge "Clear events when ACTION_CANCEL is present" into qt-dev am: cdf3e2905a
am: 1595a0786c

Change-Id: I2aa8604c4df53c6429525333e7714fbfcc930bea