Merge "Fix event validation check for CHOOSER_ACTION usage events" into main