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

Change-Id: Id2244bbf9e6bbde85179d783a32a0c21b5c04b19