diff --git a/res/xml/gesture_navigation_settings.xml b/res/xml/gesture_navigation_settings.xml
index e2b31562f19..040a31b613d 100644
--- a/res/xml/gesture_navigation_settings.xml
+++ b/res/xml/gesture_navigation_settings.xml
@@ -54,19 +54,6 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="search_gesture_category"
-        android:persistent="false"
-        android:title="@string/search_gesture_category_title"
-        settings:controller="com.google.android.settings.gestures.GestureNavigationSettingsGoogleSearchController">
-        <SwitchPreferenceCompat
-            android:key="search_gesture_press_hold"
-            android:summary="@string/search_press_hold_gesture_summary"
-            android:title="@string/search_press_hold_gesture_title"
-            settings:controller="com.google.android.settings.gestures.GestureNavigationSettingsGoogleSearchController"
-            settings:highlightableMenuKey="@string/menu_key_system" />
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="back_sensitivity_category"
         android:persistent="false"
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index e34b2beb8e6..2763c94791c 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -36,6 +36,12 @@
             android:fragment="com.android.settings.notification.LockScreenNotificationsPreferencePageFragment"
             settings:controller="com.android.settings.notification.LockScreenNotificationsPreferencePageController" />
 
+        <com.android.settingslib.RestrictedSwitchPreference
+            android:key="enable_glanceable_hub_toggle"
+            android:title="@string/enable_glanceable_hub_toggle"
+            android:summary="@string/enable_glanceable_hub_toggle_summary"
+            settings:controller="com.google.android.settings.communal.GlanceableHubTogglePreferenceController"/>
+
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="security_display_lockscreen_bypass"
             android:title="@string/lockscreen_bypass_title"
@@ -90,11 +96,6 @@
             android:summary="@string/lockscreen_double_line_clock_summary"
             settings:controller="com.android.settings.display.LockscreenClockPreferenceController" />
 
-        <SwitchPreferenceCompat
-            android:key="lockscreen_show_weather_switch"
-            android:summary="@string/lockscreen_show_weather_summary"
-            android:title="@string/lockscreen_show_weather_title"
-            settings:controller="com.google.android.settings.display.LockscreenWeatherPreferenceController" />
     </PreferenceCategory>
 
     <PreferenceCategory