Merge "Ensure the cancelled event has AKEY_EVENT_FLAG_CANCELED"