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

Change-Id: I8d9eaa3fa2f40125c1eb9643e8e3c92787e5e231