Merge "Chooser content toggling API." into main