Merge "Refactor SoundSettings to use more preference controller."