diff --git a/res/values/strings.xml b/res/values/strings.xml
index ebc8fc57cfa..2fa46d4fd89 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12577,4 +12577,6 @@
     <string name="category_name_color">Color</string>
     <!-- Others category name [CHAR LIMIT=none] -->
     <string name="category_name_others">Others</string>
+    <!-- General category name [CHAR LIMIT=none] -->
+    <string name="category_name_general">General</string>
 </resources>
diff --git a/res/xml/display_settings_v2.xml b/res/xml/display_settings_v2.xml
index 4edc335d434..0b43914cafb 100644
--- a/res/xml/display_settings_v2.xml
+++ b/res/xml/display_settings_v2.xml
@@ -33,10 +33,9 @@
             <intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG"/>
         </com.android.settingslib.RestrictedPreference>
 
-        <Preference
+        <com.android.settings.widget.PrimarySwitchPreference
             android:key="auto_brightness_entry"
             android:title="@string/auto_brightness_title"
-            android:summary="@string/summary_placeholder"
             android:fragment="com.android.settings.display.AutoBrightnessSettings"
             settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
     </PreferenceCategory>
@@ -103,7 +102,7 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/category_name_others">
+        android:title="@string/category_name_general">
 
         <SwitchPreference
             android:key="auto_rotate"