Merge "Merge "Allow same matcher to cancel >1 event activation" into qt-dev am: de7e1ccb am: 44149fc2" into qt-r1-dev-plus-aosp