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

Change-Id: Ib8cbaeabe6003ae1ab99de90d96b27f5ce5cb165