Merge "Move createChooser behavior change behind a flag" into main