Merge "Restore deleted chooser API flags." into main