Merge "Allow same matcher to cancel >1 event activation" into qt-dev
am: de7e1ccb0c

Change-Id: I53a6d2a429dd379b6334f719cfcce3ae308cb9a6