Merge "Ensure valid parameters for CHOOSER_ACTION events." into udc-dev