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

Change-Id: I0a29157f1b54e09e196f7b43fcea1212b4bf58a6