Merge "Add FLAG_CANCELED for all ACTION_CANCEL events"