diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3ec5904c749..3fb6688f38e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7829,7 +7829,9 @@
keyboard, haptics, vibrate,
- Volume, vibration, Do Not Disturb
+ Volume and vibration
+
+ Volume, vibration, Do Not Disturb
Media volume
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 1ec968a415c..44fe7fcc3d3 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -104,8 +104,9 @@
android:key="top_level_sound"
android:order="-90"
android:title="@string/sound_settings"
- android:summary="@string/sound_dashboard_summary"
- settings:highlightableMenuKey="@string/menu_key_sound"/>
+ android:summary="@string/sound_dashboard_summary_with_dnd"
+ settings:highlightableMenuKey="@string/menu_key_sound"
+ settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>
+ android:summary="@string/sound_dashboard_summary_with_dnd"
+ settings:highlightableMenuKey="@string/menu_key_sound"
+ settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>