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

Change-Id: If7d8124bb4ffc5594affe8dd0dedf446c5dee02f