Merge "Add flags for chooser APIs" into main