Merge "Limit chooser actions to 5" into udc-dev