diff --git a/config/tablet.mk b/config/tablet.mk
index 3cdc6c7f5a6eb3192829d3491c283581eafbc80e..a66ff6f5788536568a63d564d44aff92d33b0d50 100644
--- a/config/tablet.mk
+++ b/config/tablet.mk
@@ -7,4 +7,5 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Tablet-specific overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/tablet
 
-USE_TABLET_BACKGROUNDS := true
\ No newline at end of file
+PRODUCT_PACKAGES += \
+    BackgroundsTablet
diff --git a/release/aconfig/bp1a/Android.bp b/release/aconfig/bp1a/Android.bp
index 05d2d30bc6676053c41a1444f971f88dd21e7625..4b782decc1f173161adfb08eca57883df094fe1d 100644
--- a/release/aconfig/bp1a/Android.bp
+++ b/release/aconfig/bp1a/Android.bp
@@ -22,6 +22,7 @@ aconfig_value_set {
         "aconfig-values-bp1a-com.android.intentresolver-all",
         "aconfig-values-bp1a-com.android.launcher3-all",
         "aconfig-values-bp1a-com.android.permission.flags-all",
+        "aconfig-values-bp1a-com.android.settings.flags-all",
         "aconfig-values-bp1a-com.android.window.flags-all",
     ],
 }
diff --git a/release/aconfig/bp1a/com.android.settings.flags/Android.bp b/release/aconfig/bp1a/com.android.settings.flags/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..075a1890784ebc56149fa214e2ddd95e141e4a1f
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.settings.flags/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2025 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+  name: "aconfig-values-bp1a-com.android.settings.flags-all",
+  package: "com.android.settings.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/release/aconfig/bp1a/com.android.settings.flags/homepage_revamp_flag_values.textproto b/release/aconfig/bp1a/com.android.settings.flags/homepage_revamp_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..b6a54631c9c3b959c023dea7c174c65dd4b3a0ba
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.settings.flags/homepage_revamp_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "homepage_revamp"
+  state: DISABLED
+  permission: READ_ONLY
+}