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

Change-Id: I538dd480a278e7f5583c4cfce7f8adedddc18b50