Merge "Fixes sound panel create multiple SoundSettings activity"