Merge "Add back the legacy SoundPicker and create a separate directory for the new picker." into main