diff --git a/res/values/afterlife_strings.xml b/res/values/afterlife_strings.xml
index a31e8fb0653..3754f79ac8b 100644
--- a/res/values/afterlife_strings.xml
+++ b/res/values/afterlife_strings.xml
@@ -18,16 +18,16 @@
     <string name="device_info_protected_single_press">Tap to show info</string>
 
     <!-- AfterLife Maintainer -->
-    <string name="afterlife_maintainer">Keep Alive By</string>
-    <string name="its_official">This devices official supported!</string>
-    <string name="its_unofficial">This devices community supported!</string>
+    <string name="afterlife_maintainer">Kept Alive By:</string>
+    <string name="its_official">This Device Is Officially Supported!</string>
+    <string name="its_unofficial">This Device Is Community Supported!</string>
     <string name="maintainer_git_username">null</string>
     <string name="maintainer_tele_username">null</string>
     <string name="maintainer_ig_username">null</string>
     <string name="maintainer_fb_username">null</string>
 
     <!-- SELinux Status -->
-    <string name="selinux_status">SELinux status</string>
+    <string name="selinux_status">SELinux Status</string>
     <string name="selinux_status_disabled">Disabled</string>
     <string name="selinux_status_permissive">Permissive</string>
     <string name="selinux_status_enforcing">Enforcing</string>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 48a4a537599..51c1d2b5040 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -577,10 +577,6 @@
             android:title="@string/hwui_force_dark_title"
             android:summary="@string/hwui_force_dark_summary" />
 
-        <SwitchPreferenceCompat
-            android:key="enable_blurs_on_windows"
-            android:title="@string/window_blurs"/>
-
         <SwitchPreferenceCompat
             android:key="force_msaa"
             android:title="@string/force_msaa"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index efc71a07fb3..def40211bdc 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -128,6 +128,10 @@
             settings:keywords="@string/keywords_auto_rotate"
             settings:controller="com.android.settings.display.AutoRotatePreferenceController"/>
 
+        <SwitchPreference
+            android:key="enable_blurs_on_windows"
+            android:title="@string/window_blurs"/>
+
         <!--
             Auto-rotation preference that will be shown when device state based auto-rotation
             settings are available.
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 835cb1e21d3..56f04813f04 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -68,7 +68,8 @@
         android:key="tether_settings"
         android:summary="@string/summary_placeholder"
         android:order="-160"
-        android:fragment="com.android.settings.TetherSettings"
+        android:fragment="com.android.settings.network.tether.TetherSettings"
+        settings:controller="com.android.settings.network.TetherPreferenceController"
         settings:layout="@layout/afterlab_cardview_middle" />
 
     <Preference
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 37403c15c18..682edc10b08 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -26,6 +26,7 @@
 import com.android.settings.display.LiftToWakePreferenceController;
 import com.android.settings.display.ShowOperatorNamePreferenceController;
 import com.android.settings.display.TapToWakePreferenceController;
+import com.android.settings.display.EnableBlursPreferenceController;
 import com.android.settings.display.ThemePreferenceController;
 import com.android.settings.display.VrDisplayPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -81,6 +82,7 @@ private static List<AbstractPreferenceController> buildPreferenceControllers(
         controllers.add(new CameraGesturePreferenceController(context));
         controllers.add(new LiftToWakePreferenceController(context));
         controllers.add(new TapToWakePreferenceController(context));
+        controllers.add(new EnableBlursPreferenceController(context));
         controllers.add(new VrDisplayPreferenceController(context));
         controllers.add(new ShowOperatorNamePreferenceController(context));
         controllers.add(new ThemePreferenceController(context));
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 3c8ef309425..cd766c363ed 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -692,7 +692,6 @@ private static List<AbstractPreferenceController> buildPreferenceControllers(Con
         controllers.add(new DebugGpuOverdrawPreferenceController(context));
         controllers.add(new DebugNonRectClipOperationsPreferenceController(context));
         controllers.add(new ForceDarkPreferenceController(context));
-        controllers.add(new EnableBlursPreferenceController(context));
         controllers.add(new ForceMSAAPreferenceController(context));
         controllers.add(new HardwareOverlaysPreferenceController(context));
         controllers.add(new SimulateColorSpacePreferenceController(context));
diff --git a/src/com/android/settings/development/EnableBlursPreferenceController.java b/src/com/android/settings/display/EnableBlursPreferenceController.java
similarity index 80%
rename from src/com/android/settings/development/EnableBlursPreferenceController.java
rename to src/com/android/settings/display/EnableBlursPreferenceController.java
index d3a521a7798..a3fc1edf82e 100644
--- a/src/com/android/settings/development/EnableBlursPreferenceController.java
+++ b/src/com/android/settings/display/EnableBlursPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.display;
 
 import static android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED;
 
@@ -26,12 +26,12 @@
 import androidx.preference.TwoStatePreference;
 
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 /**
  * Controller that toggles window blurs on devices that support it.
  */
-public final class EnableBlursPreferenceController extends DeveloperOptionsPreferenceController
+public final class EnableBlursPreferenceController extends AbstractPreferenceController
         implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String ENABLE_BLURS_ON_WINDOWS = "enable_blurs_on_windows";
@@ -69,14 +69,5 @@ public boolean isAvailable() {
     public void updateState(Preference preference) {
         boolean isEnabled = Settings.Global.getInt(mContext.getContentResolver(),
                     Settings.Global.DISABLE_WINDOW_BLURS, 0) == 0;
-        ((TwoStatePreference) mPreference).setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.DISABLE_WINDOW_BLURS, 0);
-        updateState(null);
     }
 }