diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml
index 10bd50c972..79a96d198c 100644
--- a/quickstep/res/values/config.xml
+++ b/quickstep/res/values/config.xml
@@ -42,7 +42,7 @@
     <string name="wellbeing_provider_pkg" translatable="false"/>
 
     <integer name="max_depth_blur_radius">23</integer>
-    <dimen name="max_depth_blur_radius_enhanced">34dp</dimen>
+    <dimen name="max_depth_blur_radius_enhanced">30dp</dimen>
 
     <!-- If predicted widgets from prediction service are less than this number, additional
     eligible widgets may be added locally by launcher. When set to 0, no widgets will be added
diff --git a/quickstep/src/com/android/quickstep/util/BaseDepthController.java b/quickstep/src/com/android/quickstep/util/BaseDepthController.java
index b17bb00f50..bbcb69a789 100644
--- a/quickstep/src/com/android/quickstep/util/BaseDepthController.java
+++ b/quickstep/src/com/android/quickstep/util/BaseDepthController.java
@@ -37,6 +37,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
+import com.android.app.animation.Interpolators;
 import com.android.launcher3.Flags;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
@@ -250,7 +251,8 @@ public class BaseDepthController {
         int previousBlur = mCurrentBlur;
         int newBlur = mBlursEnabled && !hasOpaqueBg ? (int) (blurAmount * mMaxBlurRadius) : 0;
         int delta = Math.abs(newBlur - previousBlur);
-        if (skipSimilarBlur && delta < Utilities.dpToPx(1) && newBlur != 0 && previousBlur != 0) {
+        if (skipSimilarBlur && delta < Utilities.dpToPx(1) && newBlur != 0 && previousBlur != 0
+                && blurAmount != 1f) {
             Log.d(TAG, "Skipping small blur delta. newBlur: " + newBlur + " previousBlur: "
                     + previousBlur + " delta: " + delta + " surface: " + blurSurface);
             return;
@@ -265,7 +267,7 @@ public class BaseDepthController {
                     .setOpaque(blurSurface, isSurfaceOpaque);
             // Set early wake-up flags when we know we're executing an expensive operation, this way
             // SurfaceFlinger will adjust its internal offsets to avoid jank.
-            boolean wantsEarlyWakeUp = depth > 0 && depth < 1;
+            boolean wantsEarlyWakeUp = blurAmount > 0 && blurAmount < 1;
             if (wantsEarlyWakeUp && !mInEarlyWakeUp) {
                 setEarlyWakeup(finalTransaction, true);
             } else if (!wantsEarlyWakeUp && mInEarlyWakeUp) {
@@ -311,6 +313,7 @@ public class BaseDepthController {
         if (mInEarlyWakeUp == start) {
             return;
         }
+        Log.d(TAG, "setEarlyWakeup: " + start);
         if (start) {
             Trace.instantForTrack(TRACE_TAG_APP, TAG, "notifyRendererForGpuLoadUp");
             mLauncher.getRootView().getViewRootImpl().notifyRendererForGpuLoadUp("applyBlur");
@@ -341,9 +344,18 @@ public class BaseDepthController {
 
     private void setDepth(float depth) {
         depth = Utilities.boundToRange(depth, 0, 1);
-        // Round out the depth to dedupe frequent, non-perceptable updates
-        int depthI = (int) (depth * 256);
-        float depthF = depthI / 256f;
+        // Depth of the Launcher state we are in or transitioning to.
+        float targetStateDepth = mLauncher.getStateManager().getState().getDepth(mLauncher);
+
+        float depthF;
+        if (depth == targetStateDepth) {
+            // Always apply the target state depth.
+            depthF = depth;
+        } else {
+            // Round out the depth to dedupe frequent, non-perceptable updates
+            int depthI = (int) (depth * 256);
+            depthF = depthI / 256f;
+        }
         if (Float.compare(mDepth, depthF) == 0) {
             return;
         }
@@ -416,7 +428,7 @@ public class BaseDepthController {
      * The blur percentage grows linearly with depth, and maxes out at 30% depth.
      */
     private static float mapDepthToBlur(float depth) {
-        return Math.min(3 * depth, 1f);
+        return Interpolators.clampToProgress(depth, 0, 0.3f);
     }
 
     private SurfaceControl.Transaction createTransaction() {
diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java
index 4c04b66c47..3312844954 100644
--- a/src/com/android/launcher3/touch/AllAppsSwipeController.java
+++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java
@@ -209,9 +209,10 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController {
             if (!config.isUserControlled()) {
                 config.setInterpolator(ANIM_VERTICAL_PROGRESS, EMPHASIZED);
             }
-            config.setInterpolator(ANIM_WORKSPACE_SCALE, ALL_APPS_SHEET_DEPTH);
-            config.setInterpolator(ANIM_HOTSEAT_SCALE, ALL_APPS_SHEET_DEPTH);
-            config.setInterpolator(ANIM_DEPTH, ALL_APPS_SHEET_DEPTH);
+            config.setInterpolator(ANIM_WORKSPACE_SCALE,
+                Interpolators.reverse(ALL_APPS_SHEET_DEPTH));
+            config.setInterpolator(ANIM_HOTSEAT_SCALE, Interpolators.reverse(ALL_APPS_SHEET_DEPTH));
+            config.setInterpolator(ANIM_DEPTH, Interpolators.reverse(ALL_APPS_SHEET_DEPTH));
             if (!Flags.allAppsBlur() && launcher.getDeviceProfile().isPhone) {
                 // On phones without blur, reveal the workspace and hotseat when leaving All Apps.
                 config.setInterpolator(ANIM_WORKSPACE_FADE, INSTANT);