Merge "Fixes sound panel create multiple SoundSettings activity" am: e45a8aadd4 am: 3999464409

Change-Id: I2b5875e2c79daf6e5b7173da59b33e2cfcfbad6e