diff --git a/quickstep/res/values-night/colors.xml b/quickstep/res/values-night/colors.xml
index 7cb85bcc8e..293c00c877 100644
--- a/quickstep/res/values-night/colors.xml
+++ b/quickstep/res/values-night/colors.xml
@@ -16,7 +16,6 @@
 <resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
 
     <color name="gesture_tutorial_back_arrow_color">#99000000</color>
-
     <color name="gesture_tutorial_fake_wallpaper_color">#000000</color> <!-- Black -->
 
     <color name="mock_webpage_url_bar">#202124</color>
diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml
index 70c38c7478..a1b64fc3a9 100644
--- a/quickstep/res/values/colors.xml
+++ b/quickstep/res/values/colors.xml
@@ -22,6 +22,7 @@
     <color name="all_apps_label_text_dark">#61FFFFFF</color>
     <color name="all_apps_prediction_row_separator">#3c000000</color>
     <color name="all_apps_prediction_row_separator_dark">#3cffffff</color>
+    <color name="all_apps_blur_scrim">#66404040</color>
 
     <!-- Taskbar -->
     <color name="taskbar_nav_icon_selection_ripple">#E0E0E0</color>
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 54babbc686..82d7ce76a9 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -379,4 +379,24 @@
         <item name="android:textSize">16sp</item>
         <item name="android:minHeight">36dp</item>
     </style>
+
+    <style name="BlurStyle">
+        <item name="allAppsScrimColor">@color/all_apps_blur_scrim</item>
+        <item name="groupHighlight">@androidprv:color/surface_effect_1</item>
+        <item name="allAppsSurfaceLow">@androidprv:color/surface_effect_0</item>
+        <item name="allAppsSurfaceHighest">@androidprv:color/surface_effect_2</item>
+        <item name="allAppsUnselectedTab">@androidprv:color/surface_effect_1</item>
+        <item name="allappsHeaderProtectionColor">@androidprv:color/surface_effect_0</item>
+        <item name="privateSpaceSettingsColor">@androidprv:color/surface_effect_2</item>
+    </style>
+
+    <style name="BlurFallbackStyle">
+        <item name="allAppsScrimColor">@color/widgets_picker_scrim</item>
+        <item name="groupHighlight">@color/materialColorSurfaceContainerHigh</item>
+        <item name="allAppsSurfaceLow">@color/materialColorSurfaceContainerLow</item>
+        <item name="allAppsSurfaceHighest">@color/materialColorSurfaceContainerHighest</item>
+        <item name="allAppsUnselectedTab">@color/materialColorSurfaceBright</item>
+        <item name="allappsHeaderProtectionColor">@color/materialColorPrimaryContainer</item>
+        <item name="privateSpaceSettingsColor">@color/materialColorSurfaceBright</item>
+    </style>
 </resources>
diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index d9808308e8..969e199522 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -53,7 +53,7 @@ public class DepthController extends BaseDepthController implements StateHandler
 
     private final Consumer<Boolean> mCrossWindowBlurListener = this::setCrossWindowBlursEnabled;
 
-    private final Runnable mOpaquenessListener = this::applyDepthAndBlur;
+    private final Runnable mOpaquenessListener = this::onBlurChange;
 
     // Workaround for animating the depth when multiwindow mode changes.
     private boolean mIgnoreStateChangesDuringMultiWindowAnimation = false;
diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
index 916b28ec0f..dabc7dafef 100644
--- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
@@ -20,6 +20,7 @@ import static com.android.app.animation.Interpolators.EMPHASIZED;
 import static com.android.app.animation.Interpolators.LINEAR;
 import static com.android.launcher3.touch.AllAppsSwipeController.ALL_APPS_FADE_MANUAL;
 import static com.android.launcher3.touch.AllAppsSwipeController.SCRIM_FADE_MANUAL;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.animation.Animator;
 import android.content.Context;
@@ -28,6 +29,7 @@ import android.graphics.Rect;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.AttributeSet;
+import android.view.CrossWindowBlurListeners;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.Interpolator;
@@ -47,11 +49,14 @@ import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.AbstractSlideInView;
 
+import java.util.function.Consumer;
+
 /** Wrapper for taskbar all apps with slide-in behavior. */
 public class TaskbarAllAppsSlideInView extends AbstractSlideInView<TaskbarOverlayContext>
         implements Insettable, DeviceProfile.OnDeviceProfileChangeListener {
     private final Handler mHandler;
     private final int mMaxBlurRadius;
+    private final Consumer<Boolean> mWindowBlurListener = blursEnabled -> invalidate();
 
     private TaskbarAllAppsContainerView mAppsView;
     private float mShiftRange;
@@ -214,6 +219,7 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView<TaskbarOverla
             dispatcher.registerOnBackInvokedCallback(
                     OnBackInvokedDispatcher.PRIORITY_DEFAULT, this);
         }
+        CrossWindowBlurListeners.getInstance().addListener(MAIN_EXECUTOR, mWindowBlurListener);
     }
 
     @Override
@@ -226,6 +232,7 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView<TaskbarOverla
         if (dispatcher != null) {
             dispatcher.unregisterOnBackInvokedCallback(this);
         }
+        CrossWindowBlurListeners.getInstance().removeListener(mWindowBlurListener);
     }
 
     @Override
@@ -249,13 +256,11 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView<TaskbarOverla
 
     @Override
     protected int getScrimColor(Context context) {
-        if (!mActivityContext.getDeviceProfile().shouldShowAllAppsOnSheet()) {
-            return Themes.getAttrColor(context, R.attr.allAppsScrimColor);
+        if (mActivityContext.getDeviceProfile().shouldShowAllAppsOnSheet()
+                && !Flags.allAppsBlur()) {
+            return context.getResources().getColor(R.color.widgets_picker_scrim);
         }
-        if (Flags.allAppsBlur()) {
-            return Themes.getAttrColor(context, R.attr.allAppsScrimColorOverBlur);
-        }
-        return context.getResources().getColor(R.color.widgets_picker_scrim);
+        return Themes.getAttrColor(context, R.attr.allAppsScrimColor);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java
index 3866d4a1b3..8038399e53 100644
--- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java
@@ -23,6 +23,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Flags;
 import com.android.launcher3.R;
 import com.android.launcher3.popup.PopupDataProvider;
 import com.android.launcher3.taskbar.BaseTaskbarContext;
@@ -64,6 +65,7 @@ public class TaskbarOverlayContext extends BaseTaskbarContext {
         mDragController.init(controllers);
         mDragLayer = new TaskbarOverlayDragLayer(this);
         mStashedTaskbarHeight = controllers.taskbarStashController.getStashedHeight();
+        updateBlurStyle();
 
         mUiController = controllers.uiController;
         onViewCreated();
@@ -122,6 +124,20 @@ public class TaskbarOverlayContext extends BaseTaskbarContext {
         return mDragLayer.findViewById(R.id.apps_view);
     }
 
+    @Override
+    public boolean isBackgroundBlurEnabled() {
+        return Flags.allAppsBlur() && mOverlayController != null
+                && mOverlayController.isBackgroundBlurEnabled();
+    }
+
+    /** Apply the blur or blur fallback style to the current theme. */
+    private void updateBlurStyle() {
+        if (!Flags.allAppsBlur()) {
+            return;
+        }
+        getTheme().applyStyle(getBlurStyleResId(), true);
+    }
+
     @Override
     public View.OnClickListener getItemOnClickListener() {
         return mTaskbarContext.getItemOnClickListener();
diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java
index de20f779a7..96adea1127 100644
--- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java
@@ -28,6 +28,7 @@ import android.content.Context;
 import android.graphics.PixelFormat;
 import android.util.Log;
 import android.view.AttachedSurfaceControl;
+import android.view.CrossWindowBlurListeners;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.SurfaceControl;
@@ -227,6 +228,11 @@ public final class TaskbarOverlayController {
             radius = 0;
             // intentionally falling through in case a non-0 blur was previously set.
         }
+        if (!CrossWindowBlurListeners.getInstance().isCrossWindowBlurEnabled()) {
+            Log.d(TAG, "setBackgroundBlurRadius: disabled, setting to 0");
+            radius = 0;
+            // intentionally falling through in case a non-0 blur was previously set.
+        }
         if (mOverlayContext == null) {
             Log.w(TAG, "setBackgroundBlurRadius: no overlay context");
             return;
@@ -271,6 +277,11 @@ public final class TaskbarOverlayController {
         rootSurfaceControl.applyTransactionOnDraw(transaction);
     }
 
+    boolean isBackgroundBlurEnabled() {
+        return BlurUtils.supportsBlursOnWindows()
+                && CrossWindowBlurListeners.getInstance().isCrossWindowBlurEnabled();
+    }
+
     /**
      * Proxy view connecting taskbar drag layer to the overlay window.
      *
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 6b16d0bf2e..ffd06d5c29 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -463,6 +463,20 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
         super.showAllAppsFromIntent(alreadyOnHome);
     }
 
+    @Override
+    public boolean isBackgroundBlurEnabled() {
+        return mDepthController != null && mDepthController.areBlursEnabled();
+    }
+
+    @Override
+    public void updateBlurStyle() {
+        if (!Flags.allAppsBlur()) {
+            return;
+        }
+        getTheme().applyStyle(getBlurStyleResId(), true);
+        getAppsView().onThemeChanged();
+    }
+
     protected void onItemClicked(View view) {
         if (!mSplitToWorkspaceController.handleSecondAppSelectionForSplit(view)) {
             super.getItemOnClickListener().onClick(view);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index c5fbf30d97..ba67620703 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -205,12 +205,9 @@ public class AllAppsState extends LauncherState {
 
     @Override
     public int getWorkspaceScrimColor(Launcher launcher) {
-        if (!launcher.getDeviceProfile().shouldShowAllAppsOnSheet()) {
-            return Themes.getAttrColor(launcher, R.attr.allAppsScrimColor);
+        if (launcher.getDeviceProfile().shouldShowAllAppsOnSheet() && !Flags.allAppsBlur()) {
+            return launcher.getResources().getColor(R.color.widgets_picker_scrim);
         }
-        if (Flags.allAppsBlur()) {
-            return Themes.getAttrColor(launcher, R.attr.allAppsScrimColorOverBlur);
-        }
-        return launcher.getResources().getColor(R.color.widgets_picker_scrim);
+        return Themes.getAttrColor(launcher, R.attr.allAppsScrimColor);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/util/BaseDepthController.java b/quickstep/src/com/android/quickstep/util/BaseDepthController.java
index 8d30d6d268..eecfba710c 100644
--- a/quickstep/src/com/android/quickstep/util/BaseDepthController.java
+++ b/quickstep/src/com/android/quickstep/util/BaseDepthController.java
@@ -98,6 +98,9 @@ public class BaseDepthController {
     /** Pause blur but allow transparent, can be used when launch something behind the Launcher. */
     protected boolean mPauseBlurs;
 
+    // Combination of mCrossWindowBlursEnabled, Launcher's ScrimView opacity, and mPauseBlurs.
+    private boolean mBlursEnabled;
+
     /**
      * Last blur value, in pixels, that was applied.
      */
@@ -116,6 +119,7 @@ public class BaseDepthController {
         if (Flags.allAppsBlur() || enableOverviewBackgroundWallpaperBlur()) {
             mMaxBlurRadius = activity.getResources().getDimensionPixelSize(
                     R.dimen.max_depth_blur_radius_enhanced);
+            mLauncher.updateBlurStyle();
         } else {
             mMaxBlurRadius = activity.getResources().getInteger(R.integer.max_depth_blur_radius);
         }
@@ -128,8 +132,11 @@ public class BaseDepthController {
     }
 
     protected void setCrossWindowBlursEnabled(boolean isEnabled) {
+        if (mCrossWindowBlursEnabled == isEnabled) {
+            return;
+        }
         mCrossWindowBlursEnabled = isEnabled;
-        applyDepthAndBlur();
+        onBlurChange();
     }
 
     public void setHasContentBehindLauncher(boolean hasContentBehindLauncher) {
@@ -137,10 +144,30 @@ public class BaseDepthController {
     }
 
     public void pauseBlursOnWindows(boolean pause) {
-        if (pause != mPauseBlurs) {
-            mPauseBlurs = pause;
-            applyDepthAndBlur();
+        if (pause == mPauseBlurs) {
+            return;
         }
+        mPauseBlurs = pause;
+        onBlurChange();
+    }
+
+    protected final void onBlurChange() {
+        boolean hasOpaqueBg = mLauncher.getScrimView().isFullyOpaque();
+        boolean blursEnabled = mCrossWindowBlursEnabled && !hasOpaqueBg && !mPauseBlurs;
+        if (mBlursEnabled == blursEnabled) {
+            return;
+        }
+        mBlursEnabled = blursEnabled;
+        mLauncher.updateBlurStyle();
+        applyDepthAndBlur();
+    }
+
+    /**
+     * @return {@code true} if cross window blurs are enabled, the scrim is translucent, and blurs
+     * are not currently paused. In other words, whether depth changes will also apply blur.
+     */
+    public boolean areBlursEnabled() {
+        return mBlursEnabled;
     }
 
     protected void onInvalidSurface() { }
@@ -188,8 +215,7 @@ public class BaseDepthController {
         } else {
             blurAmount = depth;
         }
-        mCurrentBlur = !mCrossWindowBlursEnabled || hasOpaqueBg || mPauseBlurs
-                ? 0 : (int) (blurAmount * mMaxBlurRadius);
+        mCurrentBlur = mBlursEnabled ? (int) (blurAmount * mMaxBlurRadius) : 0;
 
         SurfaceControl blurSurface =
                 enableOverviewBackgroundWallpaperBlur() && mBlurSurface != null ? mBlurSurface
diff --git a/res/drawable/all_apps_tabs_background_unselected.xml b/res/drawable/all_apps_tabs_background_unselected.xml
index 4004021dfd..6c0adf13a5 100644
--- a/res/drawable/all_apps_tabs_background_unselected.xml
+++ b/res/drawable/all_apps_tabs_background_unselected.xml
@@ -21,7 +21,7 @@
          android:top="@dimen/all_apps_tabs_focus_vertical_inset">
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
-            <solid android:color="@color/materialColorSurfaceBright" />
+            <solid android:color="?attr/allAppsUnselectedTab" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/res/drawable/all_apps_tabs_background_unselected_focused.xml b/res/drawable/all_apps_tabs_background_unselected_focused.xml
index 3564a0763e..83038926ba 100644
--- a/res/drawable/all_apps_tabs_background_unselected_focused.xml
+++ b/res/drawable/all_apps_tabs_background_unselected_focused.xml
@@ -28,7 +28,7 @@
         android:top="@dimen/all_apps_tabs_focus_border">
         <shape android:shape="rectangle">
             <corners android:radius="13dp" />
-            <solid android:color="@color/materialColorSurfaceBright" />
+            <solid android:color="?attr/allAppsUnselectedTab" />
             <stroke
                 android:width="@dimen/all_apps_tabs_focus_padding"
                 android:color="@color/materialColorSurfaceDim" />
diff --git a/res/drawable/bg_ps_header.xml b/res/drawable/bg_ps_header.xml
deleted file mode 100644
index 87a21e485f..0000000000
--- a/res/drawable/bg_ps_header.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2023 The Android Open Source Project
-  ~
-  ~ 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.
-  -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/accent_ripple_color">
-    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="rectangle">
-            <corners android:radius="@dimen/ps_container_corner_radius" />
-            <solid android:color="@color/materialColorSurfaceContainerHigh" />
-        </shape>
-    </item>
-</ripple>
diff --git a/res/drawable/bg_ps_mask_left_corner.xml b/res/drawable/bg_ps_mask_left_corner.xml
index 43eeedb0b4..f87c497751 100644
--- a/res/drawable/bg_ps_mask_left_corner.xml
+++ b/res/drawable/bg_ps_mask_left_corner.xml
@@ -24,7 +24,7 @@
             <path
                 android:pathData="M0 28H28C24.3228 28 20.6821 27.2759 17.2847 25.8687C13.8877 24.4614 10.8013 22.3989 8.20117 19.7988C5.60107 17.1987 3.53857 14.1123 2.13135 10.7153C0.724121 7.31787 0 3.67725 0 0V28Z"
                 android:fillType="evenOdd"
-                android:fillColor="?attr/allAppsScrimColor" />
+                android:fillColor="@android:color/white" />
         </vector>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/res/drawable/bg_ps_mask_right_corner.xml b/res/drawable/bg_ps_mask_right_corner.xml
index d63b866f9c..7a4c0d80c6 100644
--- a/res/drawable/bg_ps_mask_right_corner.xml
+++ b/res/drawable/bg_ps_mask_right_corner.xml
@@ -24,7 +24,7 @@
             <path
                 android:pathData="M28 28V0C28 3.67725 27.2759 7.31787 25.8687 10.7153C24.4614 14.1123 22.3989 17.1987 19.7988 19.7988C17.1987 22.3989 14.1123 24.4614 10.7153 25.8687C7.31787 27.2759 3.67725 28 0 28H28Z"
                 android:fillType="evenOdd"
-                android:fillColor="?attr/allAppsScrimColor" />
+                android:fillColor="@android:color/white" />
         </vector>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/res/drawable/inset_rounded_action_button.xml b/res/drawable/inset_rounded_action_button.xml
index 8ae40c07bb..7b4c4d03c0 100644
--- a/res/drawable/inset_rounded_action_button.xml
+++ b/res/drawable/inset_rounded_action_button.xml
@@ -21,10 +21,10 @@
     android:insetRight="@dimen/inset_rounded_action_button">
     <shape
         android:shape="rectangle">
-        <solid android:color="@color/materialColorSurfaceContainerLow" />
+        <solid android:color="?attr/allAppsSurfaceLow" />
         <corners android:radius="@dimen/rounded_button_radius" />
         <stroke
             android:width="1dp"
-            android:color="@color/materialColorSurfaceContainerLow" />
+            android:color="?attr/allAppsSurfaceLow" />
     </shape>
 </inset>
diff --git a/res/drawable/ps_settings_background.xml b/res/drawable/ps_settings_background.xml
index 7746012d40..7d568dc68e 100644
--- a/res/drawable/ps_settings_background.xml
+++ b/res/drawable/ps_settings_background.xml
@@ -18,6 +18,6 @@
     android:inset="4dp">
     <shape android:shape="rectangle">
         <corners android:radius="@dimen/ps_lock_corner_radius" />
-        <solid android:color="@color/materialColorSurfaceBright" />
+        <solid android:color="?attr/privateSpaceSettingsColor" />
     </shape>
 </inset>
\ No newline at end of file
diff --git a/res/drawable/work_card.xml b/res/drawable/work_card.xml
index 0e37d4f7b9..ff66971af0 100644
--- a/res/drawable/work_card.xml
+++ b/res/drawable/work_card.xml
@@ -17,7 +17,7 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/materialColorSurfaceContainerHighest" />
+    <solid android:color="?attr/allAppsSurfaceHighest" />
     <corners android:radius="@dimen/work_edu_card_radius" />
 </shape>
 
diff --git a/res/layout/private_space_header.xml b/res/layout/private_space_header.xml
index db11d7bff2..4efb6aca8c 100644
--- a/res/layout/private_space_header.xml
+++ b/res/layout/private_space_header.xml
@@ -16,18 +16,18 @@
   -->
 
 <RelativeLayout
-        android:id="@+id/ps_header_layout"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/ps_header_height"
-        android:background="@drawable/bg_ps_header"
-        android:clipToOutline="true"
-        android:gravity="center_vertical"
-        android:textDirection="locale"
-        android:orientation="horizontal"
-        android:contentDescription="@string/ps_container_lock_button_content_description"
-        android:importantForAccessibility="yes">
+    android:id="@+id/ps_header_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/ps_header_height"
+    android:background="@android:color/transparent"
+    android:clipToOutline="true"
+    android:gravity="center_vertical"
+    android:textDirection="locale"
+    android:orientation="horizontal"
+    android:contentDescription="@string/ps_container_lock_button_content_description"
+    android:importantForAccessibility="yes">
 
     <LinearLayout
         android:id="@+id/settingsAndLockGroup"
diff --git a/res/layout/private_space_mask_view.xml b/res/layout/private_space_mask_view.xml
index 44e2797020..ad8947f20e 100644
--- a/res/layout/private_space_mask_view.xml
+++ b/res/layout/private_space_mask_view.xml
@@ -50,6 +50,6 @@
         app:layout_constraintEnd_toEndOf="@id/right_corner"
         app:layout_constraintTop_toBottomOf="@id/left_corner"
         android:importantForAccessibility="no"
-        android:background="?attr/allAppsScrimColor"/>
+        android:background="@android:color/white"/>
 
 </com.android.launcher3.allapps.FloatingMaskView>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7d50d7dc02..581be98f9e 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -19,9 +19,13 @@
 
     <!-- Attributes used for launcher theme -->
     <attr name="allAppsScrimColor" format="color" />
-    <attr name="allAppsScrimColorOverBlur" format="color" />
     <attr name="allappsHeaderProtectionColor" format="color" />
     <attr name="allAppsNavBarScrimColor" format="color" />
+    <attr name="allAppsSurfaceLow" format="color" />
+    <attr name="allAppsSurfaceHighest" format="color" />
+    <attr name="allAppsUnselectedTab" format="color" />
+    <attr name="allAppsSearchIconBackground" format="color" />
+    <attr name="privateSpaceSettingsColor" format="color" />
     <attr name="allAppsTheme" format="reference" />
     <attr name="popupColorPrimary" format="color" />
     <attr name="popupColorSecondary" format="color" />
@@ -46,6 +50,10 @@
     <attr name="focusOutlineColor" format="color" />
     <attr name="focusInnerOutlineColor" format="color" />
 
+    <!-- Device search related attributes -->
+    <attr name="focusHighlight" format="color" />
+    <attr name="groupHighlight" format="color" />
+    <attr name="searchboxHighlight" format="color" />
 
     <attr name="pageIndicatorDotColor" format="color" />
     <attr name="pageIndicatorArrowBgColor" format="color" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 88f542eb5c..dc4daebbe1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -552,7 +552,6 @@
     <dimen name="default_ime_height">300dp</dimen>
 
     <!-- Private Space parameters -->
-    <dimen name="ps_container_corner_radius">28dp</dimen>
     <dimen name="ps_header_height">72dp</dimen>
     <dimen name="ps_header_relative_layout_height">48dp</dimen>
     <dimen name="ps_header_image_height">48dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b7e19e5aa9..6ed5a77a92 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -39,10 +39,14 @@
 
     <style name="LauncherTheme" parent="@style/DynamicColorsBaseLauncherTheme">
         <item name="android:textColorSecondary">#DE000000</item>
+        <item name="groupHighlight">@color/materialColorSurfaceContainerHigh</item>
         <item name="allAppsScrimColor">@color/materialColorSurfaceDim</item>
-        <item name="allAppsScrimColorOverBlur">#33000000</item>
         <item name="allappsHeaderProtectionColor">@color/materialColorSurfaceContainerHighest</item>
         <item name="allAppsNavBarScrimColor">#66FFFFFF</item>
+        <item name="allAppsSurfaceLow">@color/materialColorSurfaceContainerLow</item>
+        <item name="allAppsSurfaceHighest">@color/materialColorSurfaceContainerHighest</item>
+        <item name="allAppsUnselectedTab">@color/materialColorSurfaceBright</item>
+        <item name="privateSpaceSettingsColor">@color/materialColorSurfaceBright</item>
         <item name="popupColorPrimary">@color/popup_color_primary_light</item>
         <item name="popupColorSecondary">@color/popup_color_secondary_light</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_light</item>
@@ -117,7 +121,6 @@
         <item name="android:colorControlHighlight">#19FFFFFF</item>
         <item name="android:colorPrimary">#FF212121</item>
         <item name="allAppsScrimColor">@color/materialColorSurfaceDim</item>
-        <item name="allAppsScrimColorOverBlur">#52000000</item>
         <item name="allappsHeaderProtectionColor">@color/materialColorSurfaceContainerLow</item>
         <item name="allAppsNavBarScrimColor">#80000000</item>
         <item name="popupColorPrimary">@color/popup_color_primary_dark</item>
@@ -173,6 +176,11 @@
     <style name="AppTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark.DarkMainColor" />
     <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" />
 
+    <!-- Theme overrides when blur is enabled. -->
+    <style name="BlurStyle" />
+    <!-- Theme overrides when blur is available but currently disabled. -->
+    <style name="BlurFallbackStyle" />
+
     <style name="HomeSettings.Theme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="android:navigationBarColor">?android:colorPrimaryDark</item>
         <item name="android:windowActionBar">false</item>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ec76fe5cdf..bbfebf185f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1688,6 +1688,9 @@ public class Launcher extends StatefulActivity<LauncherState>
         toggleAllApps(/* alreadyOnHome= */ true, focusSearch);
     }
 
+    /** Apply the blur or blur fallback style to the current theme. */
+    public void updateBlurStyle() {}
+
     private void toggleAllApps(boolean alreadyOnHome, boolean focusSearch) {
         if (getStateManager().isInStableState(ALL_APPS)) {
             getStateManager().goToState(NORMAL, alreadyOnHome);
diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
index 2780f893a3..9ea58e64ec 100644
--- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
@@ -66,6 +66,7 @@ import androidx.annotation.Px;
 import androidx.annotation.VisibleForTesting;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.graphics.ColorUtils;
+import androidx.core.util.Consumer;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.DeviceProfile;
@@ -180,8 +181,9 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
     private float[] mBottomSheetCornerRadii;
     private ScrimView mScrimView;
     private int mHeaderColor;
-    private int mBottomSheetBackgroundColor;
-    private float mBottomSheetBackgroundAlpha = 1f;
+    private int mBottomSheetBackgroundColorBlurFallback;
+    private int mBottomSheetBackgroundColorOverBlur;
+    private int mBottomSheetBackgroundColorLegacy;
     private int mTabsProtectionAlpha;
     @Nullable private AllAppsTransitionController mAllAppsTransitionController;
 
@@ -312,17 +314,22 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
                 0,
                 0 // Bottom left
         };
+
         if (Flags.allAppsBlur()) {
-            int resId = Utilities.isDarkTheme(getContext())
-                    ? android.R.color.system_accent1_800 : android.R.color.system_accent1_100;
-            int layerAbove = ColorUtils.setAlphaComponent(getResources().getColor(resId, null),
-                    (int) (0.4f * 255));
+            int overBlurBaseColor = getContext().getColor(Utilities.isDarkTheme(getContext())
+                            ? android.R.color.system_accent1_800
+                            : android.R.color.system_accent1_100);
+            int layerAbove = ColorUtils.setAlphaComponent(overBlurBaseColor, (int) (0.4f * 255));
             int layerBelow = ColorUtils.setAlphaComponent(Color.WHITE, (int) (0.1f * 255));
-            mBottomSheetBackgroundColor = ColorUtils.compositeColors(layerAbove, layerBelow);
-        } else {
-            mBottomSheetBackgroundColor = getContext().getColor(R.color.materialColorSurfaceDim);
+            mBottomSheetBackgroundColorOverBlur = ColorUtils.compositeColors(layerAbove,
+                    layerBelow);
+            mBottomSheetBackgroundColorBlurFallback = getContext().getColor(
+                    Utilities.isDarkTheme(getContext()) ? android.R.color.system_accent1_800
+                            : android.R.color.system_accent2_100);
         }
-        mBottomSheetBackgroundAlpha = Color.alpha(mBottomSheetBackgroundColor) / 255.0f;
+
+        mBottomSheetBackgroundColorLegacy = getContext().getColor(R.color.materialColorSurfaceDim);
+
         updateBackgroundVisibility(mActivityContext.getDeviceProfile());
         mSearchUiManager.initializeSearch(this);
     }
@@ -789,8 +796,8 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
     }
 
     protected void updateHeaderScroll(int scrolledOffset) {
-        float prog1 = Utilities.boundToRange((float) scrolledOffset / mHeaderThreshold, 0f, 1f);
-        int headerColor = getHeaderColor(prog1);
+        float prog = Utilities.boundToRange((float) scrolledOffset / mHeaderThreshold, 0f, 1f);
+        int headerColor = getHeaderColor(prog);
         int tabsAlpha = mHeader.getPeripheralProtectionHeight(/* expectedHeight */ false) == 0 ? 0
                 : (int) (Utilities.boundToRange(
                         (scrolledOffset + mHeader.mSnappedScrolledY) / mHeaderThreshold, 0f, 1f)
@@ -804,7 +811,6 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
             return;
         }
 
-        float prog = Utilities.boundToRange((float) scrolledOffset / mHeaderThreshold, 0f, 1f);
         boolean bgVisible = mSearchUiManager.getBackgroundVisibility();
         if (scrolledOffset == 0 && !isSearching()) {
             bgVisible = true;
@@ -815,9 +821,43 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
     }
 
     protected int getHeaderColor(float blendRatio) {
-        return ColorUtils.setAlphaComponent(
-                ColorUtils.blendARGB(mScrimColor, mHeaderProtectionColor, blendRatio),
-                (int) (mSearchContainer.getAlpha() * 255));
+        if (!mActivityContext.getDeviceProfile().shouldShowAllAppsOnSheet()) {
+            return ColorUtils.setAlphaComponent(
+                    ColorUtils.blendARGB(mScrimColor, mHeaderProtectionColor, blendRatio),
+                    (int) (mSearchContainer.getAlpha() * 255));
+        }
+        return isBackgroundBlurEnabled()
+                ? ColorUtils.setAlphaComponent(mHeaderProtectionColor, (int) (blendRatio * 255))
+                : ColorUtils.blendARGB(getBackgroundColor(), mHeaderProtectionColor, blendRatio);
+    }
+
+    private int getBackgroundColor() {
+        return mActivityContext.getDeviceProfile().shouldShowAllAppsOnSheet()
+                ? getBottomSheetBackgroundColor() : mScrimColor;
+    }
+
+    int getBottomSheetBackgroundColor() {
+        if (!Flags.allAppsBlur()) {
+            return mBottomSheetBackgroundColorLegacy;
+        }
+        if (!mActivityContext.isBackgroundBlurEnabled()) {
+            // Don't apply any alpha if the blur is disabled.
+            return mBottomSheetBackgroundColorBlurFallback;
+        }
+        return mBottomSheetBackgroundColorOverBlur;
+    }
+
+    boolean isBackgroundBlurEnabled() {
+        return Flags.allAppsBlur() && mActivityContext.isBackgroundBlurEnabled();
+    }
+
+    /** Refresh the UI according to the current theme. */
+    public void onThemeChanged() {
+        updateHeaderScroll(getActiveRecyclerView().computeVerticalScrollOffset());
+        invalidateHeader();
+        forAllRecyclerViews(RecyclerView::invalidateItemDecorations);
+        getSearchUiManager().onThemeChanged();
+        getFloatingHeaderView().getTabLayout().updateTheme();
     }
 
     /**
@@ -1099,6 +1139,16 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
         return getActiveAppsRecyclerView();
     }
 
+    /** Run some code on all the recycler views. */
+    protected void forAllRecyclerViews(Consumer<AllAppsRecyclerView> consumer) {
+        for (AdapterHolder holder : mAH) {
+            if (holder.mRecyclerView == null) {
+                continue;
+            }
+            consumer.accept(holder.mRecyclerView);
+        }
+    }
+
     /** The current focus change listener in the search container. */
     public OnFocusChangeListener getSearchFocusChangeListener() {
         return mAH.get(AdapterHolder.SEARCH).mOnFocusChangeListener;
@@ -1413,9 +1463,11 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
         final float rightWithScale = panel.getRight() - horizontalScaleOffset;
         final float bottomWithOffset = panel.getBottom() + bottomOffsetPx;
         // Draw full background panel for tablets.
+        int bottomSheetBackgroundColor = getBottomSheetBackgroundColor();
+        float bottomSheetBackgroundAlpha = Color.alpha(bottomSheetBackgroundColor) / 255.0f;
         if (hasBottomSheet) {
-            mHeaderPaint.setColor(mBottomSheetBackgroundColor);
-            mHeaderPaint.setAlpha((int) (mBottomSheetBackgroundAlpha * 255));
+            mHeaderPaint.setColor(bottomSheetBackgroundColor);
+            mHeaderPaint.setAlpha((int) (bottomSheetBackgroundAlpha * 255));
 
             mTmpRectF.set(
                     leftWithScale,
@@ -1427,7 +1479,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
             canvas.drawPath(mTmpPath, mHeaderPaint);
 
             // When the background panel is blurred, we don't add header protection.
-            if (Flags.allAppsBlur()) {
+            if (isBackgroundBlurEnabled()) {
                 return;
             }
         }
@@ -1439,12 +1491,16 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
             mHeaderPaint.setColor(mHeaderColor);
             mHeaderPaint.setAlpha((int) (getAlpha() * Color.alpha(mHeaderColor)));
         }
-        if (mHeaderPaint.getColor() == mScrimColor || mHeaderPaint.getColor() == 0) {
+
+        // If header is not visible or only differs from the background with alpha, don't draw it.
+        int headerWithoutAlpha = ColorUtils.setAlphaComponent(mHeaderPaint.getColor(), 0);
+        int backgroundWithoutAlpha = ColorUtils.setAlphaComponent(getBackgroundColor(), 0);
+        if (headerWithoutAlpha == backgroundWithoutAlpha || mHeaderPaint.getColor() == 0) {
             return;
         }
 
         if (hasBottomSheet) {
-            mHeaderPaint.setAlpha((int) (mHeaderPaint.getAlpha() * mBottomSheetBackgroundAlpha));
+            mHeaderPaint.setAlpha((int) (mHeaderPaint.getAlpha() * bottomSheetBackgroundAlpha));
         }
 
         // Draw header on background panel
@@ -1480,7 +1536,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
             } else {
                 float tabAlpha = getAlpha() * mTabsProtectionAlpha;
                 if (hasBottomSheet) {
-                    tabAlpha *= mBottomSheetBackgroundAlpha;
+                    tabAlpha *= bottomSheetBackgroundAlpha;
                 }
                 mHeaderPaint.setAlpha((int) tabAlpha);
             }
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 01f7389c28..206edda03b 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -468,7 +468,7 @@ public class AlphabeticalAppsList<T extends Context & ActivityContext> implement
             if (hasPrivateApps) {
                 mAdapterItems.add(AdapterItem.asAppWithDecorationInfo(info,
                         new SectionDecorationInfo(mActivityContext,
-                                getRoundRegions(i, appList.size()), true /* decorateTogether */)));
+                                getRoundRegions(i, appList.size()))));
             } else {
                 mAdapterItems.add(AdapterItem.asApp(info));
             }
diff --git a/src/com/android/launcher3/allapps/BaseAllAppsAdapter.java b/src/com/android/launcher3/allapps/BaseAllAppsAdapter.java
index e8b7247240..c72343fab7 100644
--- a/src/com/android/launcher3/allapps/BaseAllAppsAdapter.java
+++ b/src/com/android/launcher3/allapps/BaseAllAppsAdapter.java
@@ -314,14 +314,13 @@ public abstract class BaseAllAppsAdapter<T extends Context & ActivityContext> ex
                     roundRegions |= (ROUND_BOTTOM_LEFT | ROUND_BOTTOM_RIGHT);
                 }
                 adapterItem.decorationInfo =
-                        new SectionDecorationInfo(mActivityContext, roundRegions,
-                                false /* decorateTogether */);
+                        new SectionDecorationInfo(mActivityContext, roundRegions);
                 break;
             case VIEW_TYPE_PRIVATE_SPACE_SYS_APPS_DIVIDER:
                 adapterItem = mApps.getAdapterItems().get(position);
-                adapterItem.decorationInfo = mApps.getPrivateProfileManager().getCurrentState()
-                        == STATE_DISABLED ? null : new SectionDecorationInfo(mActivityContext,
-                        ROUND_NOTHING, true /* decorateTogether */);
+                adapterItem.decorationInfo =
+                        mApps.getPrivateProfileManager().getCurrentState() == STATE_DISABLED ? null
+                                : new SectionDecorationInfo(mActivityContext, ROUND_NOTHING);
                 break;
             case VIEW_TYPE_BOTTOM_VIEW_TO_SCROLL_TO:
             case VIEW_TYPE_ALL_APPS_DIVIDER:
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 81935119ef..896a4e1073 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -38,6 +38,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.allapps.ActivityAllAppsContainerView.AdapterHolder;
 import com.android.launcher3.util.PluginManagerWrapper;
 import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip;
 import com.android.systemui.plugins.AllAppsRow;
 import com.android.systemui.plugins.AllAppsRow.OnHeightUpdatedListener;
 import com.android.systemui.plugins.PluginListener;
@@ -87,7 +88,7 @@ public class FloatingHeaderView extends LinearLayout implements
     private final int mTabsAdditionalPaddingTop;
     private final int mTabsAdditionalPaddingBottom;
 
-    protected ViewGroup mTabLayout;
+    protected PersonalWorkSlidingTabStrip mTabLayout;
     private AllAppsRecyclerView mMainRV;
     private AllAppsRecyclerView mWorkRV;
     private SearchRecyclerView mSearchRV;
@@ -414,7 +415,7 @@ public class FloatingHeaderView extends LinearLayout implements
         return !mTabsHidden;
     }
 
-    ViewGroup getTabLayout() {
+    PersonalWorkSlidingTabStrip getTabLayout() {
         return mTabLayout;
     }
 
diff --git a/src/com/android/launcher3/allapps/FloatingMaskView.java b/src/com/android/launcher3/allapps/FloatingMaskView.java
index cee5e18958..c211c80286 100644
--- a/src/com/android/launcher3/allapps/FloatingMaskView.java
+++ b/src/com/android/launcher3/allapps/FloatingMaskView.java
@@ -17,6 +17,8 @@
 package com.android.launcher3.allapps;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Configuration;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -31,6 +33,8 @@ public class FloatingMaskView extends ConstraintLayout {
 
     private final ActivityContext mActivityContext;
     private ImageView mBottomBox;
+    private ImageView mLeftCorner;
+    private ImageView mRightCorner;
 
     public FloatingMaskView(Context context) {
         this(context, null, 0);
@@ -49,6 +53,9 @@ public class FloatingMaskView extends ConstraintLayout {
     protected void onFinishInflate() {
         super.onFinishInflate();
         mBottomBox = findViewById(R.id.bottom_box);
+        mLeftCorner = findViewById(R.id.left_corner);
+        mRightCorner = findViewById(R.id.right_corner);
+        updateColors();
     }
 
     @Override
@@ -58,6 +65,19 @@ public class FloatingMaskView extends ConstraintLayout {
                 mActivityContext.getAppsView().getActiveRecyclerView());
     }
 
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        updateColors();
+    }
+
+    private void updateColors() {
+        int color = mActivityContext.getAppsView().getBottomSheetBackgroundColor();
+        mBottomBox.setBackgroundColor(color);
+        mLeftCorner.setBackgroundTintList(ColorStateList.valueOf(color));
+        mRightCorner.setBackgroundTintList(ColorStateList.valueOf(color));
+    }
+
     @VisibleForTesting
     void setParameters(ViewGroup.MarginLayoutParams lp, AllAppsRecyclerView recyclerView) {
         if (lp != null) {
diff --git a/src/com/android/launcher3/allapps/PrivateProfileManager.java b/src/com/android/launcher3/allapps/PrivateProfileManager.java
index 54551908f0..2bedb82179 100644
--- a/src/com/android/launcher3/allapps/PrivateProfileManager.java
+++ b/src/com/android/launcher3/allapps/PrivateProfileManager.java
@@ -203,8 +203,7 @@ public class PrivateProfileManager extends UserProfileManager {
 
         BaseAllAppsAdapter.AdapterItem item = new BaseAllAppsAdapter.AdapterItem(VIEW_TYPE_ICON);
         item.itemInfo = itemInfo;
-        item.decorationInfo = new SectionDecorationInfo(context, ROUND_NOTHING,
-                /* decorateTogether */ true);
+        item.decorationInfo = new SectionDecorationInfo(context, ROUND_NOTHING);
 
         adapterItems.add(item);
         mAllApps.mAH.get(MAIN).mAdapter.notifyItemInserted(adapterItems.size() - 1);
@@ -224,9 +223,7 @@ public class PrivateProfileManager extends UserProfileManager {
     }
 
     /**
-     * Resets the current state of Private Profile, w.r.t. to Launcher. The decorator should only
-     * be applied upon expand before animating. When collapsing, reset() will remove the decorator
-     * when animation is not running.
+     * Resets the current state of Private Profile, w.r.t. to Launcher.
      */
     public void reset() {
         Trace.beginSection("PrivateProfileManager#reset");
@@ -248,7 +245,7 @@ public class PrivateProfileManager extends UserProfileManager {
         } else if (previousState == STATE_ENABLED && updatedState == STATE_DISABLED){
             executeLock();
         }
-        addPrivateSpaceDecorator(updatedState);
+        addPrivateSpaceDecorator();
         Trace.endSection();
     }
 
@@ -282,26 +279,24 @@ public class PrivateProfileManager extends UserProfileManager {
         setPrivateSpaceSettingsAvailable(apiWrapper.getPrivateSpaceSettingsIntent() != null);
     }
 
-    /** Adds a private space decorator only when STATE_ENABLED. */
+    /** Adds a private space decorator to the main (personal) app recyclerview. */
     @VisibleForTesting
-    void addPrivateSpaceDecorator(int updatedState) {
+    void addPrivateSpaceDecorator() {
         ActivityAllAppsContainerView<?>.AdapterHolder mainAdapterHolder = mAllApps.mAH.get(MAIN);
-        if (updatedState == STATE_ENABLED) {
-            // Create a new decorator instance if not already available.
-            if (mPrivateAppsSectionDecorator == null) {
-                mPrivateAppsSectionDecorator = new PrivateAppsSectionDecorator(
-                        mainAdapterHolder.mAppsList);
-            }
-            for (int i = 0; i < mainAdapterHolder.mRecyclerView.getItemDecorationCount(); i++) {
-                if (mainAdapterHolder.mRecyclerView.getItemDecorationAt(i)
-                        .equals(mPrivateAppsSectionDecorator)) {
-                    // No need to add another decorator if one is already present in recycler view.
-                    return;
-                }
-            }
-            // Add Private Space Decorator to the Recycler view.
-            mainAdapterHolder.mRecyclerView.addItemDecoration(mPrivateAppsSectionDecorator);
+        // Create a new decorator instance if not already available.
+        if (mPrivateAppsSectionDecorator == null) {
+            mPrivateAppsSectionDecorator = new PrivateAppsSectionDecorator(
+                    mainAdapterHolder.mAppsList);
         }
+        for (int i = 0; i < mainAdapterHolder.mRecyclerView.getItemDecorationCount(); i++) {
+            if (mainAdapterHolder.mRecyclerView.getItemDecorationAt(i)
+                    .equals(mPrivateAppsSectionDecorator)) {
+                // No need to add another decorator if one is already present in recycler view.
+                return;
+            }
+        }
+        // Add Private Space Decorator to the Recycler view.
+        mainAdapterHolder.mRecyclerView.addItemDecoration(mPrivateAppsSectionDecorator);
     }
 
     public void setQuietMode(boolean enable) {
@@ -440,7 +435,7 @@ public class PrivateProfileManager extends UserProfileManager {
         setQuietMode(lock);
     }
 
-    /** Finds the private space header to scroll to and set the private space icons to GONE. */
+    /** Finds the private space header to smooth scroll to. */
     private void collapse() {
         AllAppsRecyclerView allAppsRecyclerView = mAllApps.getActiveRecyclerView();
         List<BaseAllAppsAdapter.AdapterItem> appListAdapterItems =
@@ -463,23 +458,9 @@ public class PrivateProfileManager extends UserProfileManager {
                 RecyclerView.LayoutManager layoutManager = allAppsRecyclerView.getLayoutManager();
                 if (layoutManager != null) {
                     startAnimationScroll(allAppsRecyclerView, layoutManager, smoothScroller);
-                    // Preserve decorator if floating mask view exists.
-                    if (mFloatingMaskView == null) {
-                        currentItem.decorationInfo = null;
-                    }
                 }
                 break;
             }
-            // Make the private space apps gone to "collapse".
-            if ((mFloatingMaskView == null && isPrivateSpaceItem(currentItem)) ||
-                    currentItem.viewType == VIEW_TYPE_PRIVATE_SPACE_SYS_APPS_DIVIDER) {
-                RecyclerView.ViewHolder viewHolder =
-                        allAppsRecyclerView.findViewHolderForAdapterPosition(i);
-                if (viewHolder != null) {
-                    viewHolder.itemView.setVisibility(GONE);
-                    currentItem.decorationInfo = null;
-                }
-            }
         }
     }
 
@@ -695,8 +676,6 @@ public class PrivateProfileManager extends UserProfileManager {
                     + mPrivateSpaceSettingsButton.getVisibility()
                     + " settingsCogAlpha: " + mPrivateSpaceSettingsButton.getAlpha());
             if (!expand) {
-                mAllApps.mAH.get(MAIN).mRecyclerView.removeItemDecoration(
-                        mPrivateAppsSectionDecorator);
                 // Call onAppsUpdated() because it may be canceled when this animation occurs.
                 if (!Utilities.isRunningInTestHarness()) {
                     mAllApps.getPersonalAppList().onAppsUpdated();
@@ -861,7 +840,8 @@ public class PrivateProfileManager extends UserProfileManager {
     }
 
     private void attachFloatingMaskView(boolean expand) {
-        if (!Flags.privateSpaceAddFloatingMaskView()) {
+        // Floating mask can't block the transparent background if blur is enabled, so don't add it.
+        if (!Flags.privateSpaceAddFloatingMaskView() || mAllApps.isBackgroundBlurEnabled()) {
             return;
         }
         // Use getLocationOnScreen() as simply checking for mPSHeader.getBottom() is only relative
diff --git a/src/com/android/launcher3/allapps/RecyclerViewAnimationController.java b/src/com/android/launcher3/allapps/RecyclerViewAnimationController.java
index 6209393b20..235f5e1b9c 100644
--- a/src/com/android/launcher3/allapps/RecyclerViewAnimationController.java
+++ b/src/com/android/launcher3/allapps/RecyclerViewAnimationController.java
@@ -31,7 +31,6 @@ import android.util.FloatProperty;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.Interpolator;
 
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Utilities;
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index bfd89678df..1f7532c3e4 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -48,6 +48,9 @@ public interface SearchUiManager {
     @Nullable
     ExtendedEditText getEditText();
 
+    /** Indicates the UI should refresh according to the current theme. */
+    default void onThemeChanged() {}
+
     /**
      * Hint to the edit text that it is about to be focused or unfocused. This can be used to start
      * animating the edit box accordingly, e.g. after a gesture completes.
diff --git a/src/com/android/launcher3/allapps/SectionDecorationHandler.java b/src/com/android/launcher3/allapps/SectionDecorationHandler.java
index cae76ec0a6..bd32294b47 100644
--- a/src/com/android/launcher3/allapps/SectionDecorationHandler.java
+++ b/src/com/android/launcher3/allapps/SectionDecorationHandler.java
@@ -17,6 +17,7 @@ package com.android.launcher3.allapps;
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.RectF;
@@ -27,6 +28,7 @@ import android.view.View;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.R;
+import com.android.launcher3.util.Themes;
 
 public class SectionDecorationHandler {
 
@@ -38,14 +40,13 @@ public class SectionDecorationHandler {
     protected final RectF mBounds = new RectF();
     protected final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
-    protected final int mFocusAlpha = 255; // main focused item alpha
     protected int mFillColor; // grouping color
     protected int mFocusColor; // main focused item color
+    protected float mFillAlphaMultiplier = 1;
     protected float mFillSpacing;
     protected int mInlineRadius;
     protected Context mContext;
     protected float[] mCorners;
-    protected int mFillAlpha;
     protected boolean mIsTopLeftRound;
     protected boolean mIsTopRightRound;
     protected boolean mIsBottomLeftRound;
@@ -53,14 +54,14 @@ public class SectionDecorationHandler {
     protected boolean mIsBottomRound;
     protected boolean mIsTopRound;
 
-    public SectionDecorationHandler(Context context, int fillAlpha, boolean isTopLeftRound,
+    public SectionDecorationHandler(Context context, boolean isTopLeftRound,
             boolean isTopRightRound, boolean isBottomLeftRound,
             boolean isBottomRightRound) {
 
         mContext = context;
-        mFillAlpha = fillAlpha;
-        mFocusColor = context.getColor(R.color.materialColorSurfaceBright); // UX recommended
-        mFillColor = context.getColor(R.color.materialColorSurfaceContainerHigh); // UX recommended
+
+        mFocusColor = Themes.getAttrColor(mContext, R.attr.focusHighlight);
+        mFillColor = Themes.getAttrColor(mContext, R.attr.groupHighlight);
 
         mIsTopLeftRound = isTopLeftRound;
         mIsTopRightRound = isTopRightRound;
@@ -93,16 +94,26 @@ public class SectionDecorationHandler {
     }
 
     protected void setFillAlpha(int fillAlpha) {
-        mFillAlpha = fillAlpha;
-        mPaint.setAlpha(mFillAlpha);
+        mFillAlphaMultiplier = (float) fillAlpha / 255;
+        preparePaintForFill();
+    }
+
+    /** Set the paint color in preparation for drawing fill (group). */
+    protected void preparePaintForFill() {
+        mPaint.setColor(mFillColor);
+        mPaint.setAlpha((int) (Color.alpha(mFillColor) *  mFillAlphaMultiplier));
+    }
+
+    /** Set the paint color in preparation for drawing focus (highlight / quick launch). */
+    protected void preparePaintForFocus() {
+        mPaint.setColor(mFocusColor);
     }
 
     protected void onFocusDraw(Canvas canvas, @Nullable View view) {
         if (view == null) {
             return;
         }
-        mPaint.setColor(mFillColor);
-        mPaint.setAlpha(mFillAlpha);
+        preparePaintForFill();
         int scaledHeight = (int) (view.getHeight() * view.getScaleY());
         mBounds.set(view.getLeft(), view.getY(), view.getRight(), view.getY() + scaledHeight);
         onDraw(canvas);
@@ -162,7 +173,7 @@ public class SectionDecorationHandler {
         public UnionDecorationHandler(
                 SectionDecorationHandler decorationHandler,
                 int paddingLeft, int paddingRight) {
-            super(decorationHandler.mContext, decorationHandler.mFillAlpha,
+            super(decorationHandler.mContext,
                     decorationHandler.mIsTopLeftRound, decorationHandler.mIsTopRightRound,
                     decorationHandler.mIsBottomLeftRound, decorationHandler.mIsBottomRightRound);
             mPaddingLeft = paddingLeft;
@@ -191,8 +202,7 @@ public class SectionDecorationHandler {
             initCorners();
             mBounds.left = mPaddingLeft;
             mBounds.right = canvas.getWidth() - mPaddingRight;
-            mPaint.setColor(mFillColor);
-            mPaint.setAlpha(mFillAlpha);
+            preparePaintForFill();
             onDraw(canvas);
         }
     }
diff --git a/src/com/android/launcher3/allapps/SectionDecorationInfo.java b/src/com/android/launcher3/allapps/SectionDecorationInfo.java
index c438d19b3e..c7dabe8ba7 100644
--- a/src/com/android/launcher3/allapps/SectionDecorationInfo.java
+++ b/src/com/android/launcher3/allapps/SectionDecorationInfo.java
@@ -27,21 +27,20 @@ public class SectionDecorationInfo {
     public static final int ROUND_TOP_RIGHT = 1 << 2;
     public static final int ROUND_BOTTOM_LEFT = 1 << 3;
     public static final int ROUND_BOTTOM_RIGHT = 1 << 4;
-    public static final int DECORATOR_ALPHA = 255;
 
     protected boolean mShouldDecorateItemsTogether;
     private SectionDecorationHandler mDecorationHandler;
     protected boolean mIsTopRound;
     protected boolean mIsBottomRound;
 
-    public SectionDecorationInfo(Context context, int roundRegions, boolean decorateTogether) {
+    public SectionDecorationInfo(Context context, int roundRegions) {
         mDecorationHandler =
-                new SectionDecorationHandler(context, DECORATOR_ALPHA,
+                new SectionDecorationHandler(context,
                         isFlagEnabled(roundRegions, ROUND_TOP_LEFT),
                         isFlagEnabled(roundRegions, ROUND_TOP_RIGHT),
                         isFlagEnabled(roundRegions, ROUND_BOTTOM_LEFT),
                         isFlagEnabled(roundRegions, ROUND_BOTTOM_RIGHT));
-        mShouldDecorateItemsTogether = decorateTogether;
+        mShouldDecorateItemsTogether = true;
         mIsTopRound = isFlagEnabled(roundRegions, ROUND_TOP_LEFT) &&
                 isFlagEnabled(roundRegions, ROUND_TOP_RIGHT);
         mIsBottomRound = isFlagEnabled(roundRegions, ROUND_BOTTOM_LEFT) &&
diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java
index 35bb4a5e6f..50c941b251 100644
--- a/src/com/android/launcher3/views/ActivityContext.java
+++ b/src/com/android/launcher3/views/ActivityContext.java
@@ -209,6 +209,16 @@ public interface ActivityContext extends SavedStateRegistryOwner {
         return null;
     }
 
+    /** @return {@code true} if background blur is enabled */
+    default boolean isBackgroundBlurEnabled() {
+        return false;
+    }
+
+    /** @return the resource id of the style to apply for the current blur state. */
+    default int getBlurStyleResId() {
+        return isBackgroundBlurEnabled() ? R.style.BlurStyle : R.style.BlurFallbackStyle;
+    }
+
     DeviceProfile getDeviceProfile();
 
     /** Registered {@link OnDeviceProfileChangeListener} instances. */
diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index e94f3a065d..0d30d5f2e3 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -46,6 +46,14 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
         typedArray.recycle();
     }
 
+    /** Update the buttons background to match the theme. */
+    public void updateTheme() {
+        for (int i = 0; i < getChildCount(); i++) {
+            Button tab = (Button) getChildAt(i);
+            tab.setBackground(getContext().getDrawable(R.drawable.all_apps_tabs_background));
+        }
+    }
+
     /**
      * Highlights tab with index pos
      */
@@ -57,8 +65,7 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     }
 
     @Override
-    public void setScroll(int currentScroll, int totalScroll) {
-    }
+    public void setScroll(int currentScroll, int totalScroll) {}
 
     @Override
     public void setActiveMarker(int activePage) {
diff --git a/tests/multivalentTests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java b/tests/multivalentTests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java
index d757d10b71..98259938cd 100644
--- a/tests/multivalentTests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java
+++ b/tests/multivalentTests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java
@@ -25,7 +25,6 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
@@ -147,7 +146,7 @@ public class PrivateProfileManagerTest {
     @Test
     public void quietModeFlagPresent_privateSpaceIsResetToDisabled() {
         PrivateProfileManager privateProfileManager = spy(mPrivateProfileManager);
-        doNothing().when(privateProfileManager).addPrivateSpaceDecorator(anyInt());
+        doNothing().when(privateProfileManager).addPrivateSpaceDecorator();
         doNothing().when(privateProfileManager).executeLock();
         doReturn(mAllAppsRecyclerView).when(privateProfileManager).getMainRecyclerView();
         when(mAllAppsStore.hasModelFlag(FLAG_PRIVATE_PROFILE_QUIET_MODE_ENABLED))
@@ -167,7 +166,7 @@ public class PrivateProfileManagerTest {
     @Test
     public void transitioningToUnlocked_resetCallsPostUnlock() throws Exception {
         PrivateProfileManager privateProfileManager = spy(mPrivateProfileManager);
-        doNothing().when(privateProfileManager).addPrivateSpaceDecorator(anyInt());
+        doNothing().when(privateProfileManager).addPrivateSpaceDecorator();
         doReturn(mAllAppsRecyclerView).when(privateProfileManager).getMainRecyclerView();
         when(mAllAppsStore.hasModelFlag(FLAG_PRIVATE_PROFILE_QUIET_MODE_ENABLED))
                 .thenReturn(false);
@@ -184,7 +183,7 @@ public class PrivateProfileManagerTest {
     @Test
     public void transitioningToLocked_resetCallsExecuteLock() throws Exception {
         PrivateProfileManager privateProfileManager = spy(mPrivateProfileManager);
-        doNothing().when(privateProfileManager).addPrivateSpaceDecorator(anyInt());
+        doNothing().when(privateProfileManager).addPrivateSpaceDecorator();
         doNothing().when(privateProfileManager).executeLock();
         doReturn(mAllAppsRecyclerView).when(privateProfileManager).getMainRecyclerView();
         when(mAllAppsStore.hasModelFlag(FLAG_PRIVATE_PROFILE_QUIET_MODE_ENABLED))