Merge "Remove old code from SoundSettings not used in new IA."