diff --git a/res/layout/settings_homepage_container_a12.xml b/res/layout/settings_homepage_container_a12.xml
index 2b73dbbf66b..4929844de7e 100644
--- a/res/layout/settings_homepage_container_a12.xml
+++ b/res/layout/settings_homepage_container_a12.xml
@@ -33,8 +33,7 @@
             android:id="@+id/homepage_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:background="@color/homepage_container_bg">
+            android:orientation="vertical">
 
             <FrameLayout
                 android:id="@+id/contextual_cards_content"
@@ -47,13 +46,13 @@
                 android:id="@+id/main_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:animateLayoutChanges="true"
-                android:background="?android:attr/windowBackground"/>
+                android:animateLayoutChanges="true"/>
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_layout_a12"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:touchscreenBlocksFocus="false"
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 4a480fcab67..353294dee7b 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -49,6 +49,8 @@
 
 import com.android.settingslib.drawable.CircleFramedDrawable;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 public class SettingsHomepageActivity extends FragmentActivity {
 
     Context context;
@@ -70,7 +72,10 @@ protected void onCreate(Bundle savedInstanceState) {
         root.setSystemUiVisibility(
                 View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
 
-        setHomepageContainerPaddingTop();
+        if (useNewSearchBar)
+            setHomepageContainerPaddingTopA12();
+        else
+            setHomepageContainerPaddingTop();
 
         mUserManager = context.getSystemService(UserManager.class);
 
@@ -129,6 +134,20 @@ void setHomepageContainerPaddingTop() {
         view.requestFocus();
     }
 
+    private void setHomepageContainerPaddingTopA12() {
+        final View view = findViewById(R.id.homepage_container);
+        final AppBarLayout appBarLayout = findViewById(R.id.appbar_layout_a12);
+
+        // use appBarLayout's current height
+        appBarLayout.post(() -> {
+            view.setPadding(0, appBarLayout.getMeasuredHeight(), 0, 0);
+        });
+
+        // Prevent inner RecyclerView gets focus and invokes scrolling.
+        view.setFocusableInTouchMode(true);
+        view.requestFocus();
+    }
+
     private Drawable getCircularUserIcon(Context context) {
         Bitmap bitmapUserIcon = mUserManager.getUserIcon(UserHandle.myUserId());