Merge cherrypicks of ['googleplex-android-review.googlesource.com/34260956'] into 25Q3-release.

Change-Id: Id00ce6bf5aca7c28016dfb153be68f8fd6aa5178

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

@@ -116,6 +116,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
         OnDeviceProfileChangeListener, PersonalWorkSlidingTabStrip.OnActivePageChangedListener,
         ScrimView.ScrimDrawingController {
 
+
     private static final String TAG = "ActivityAllAppsContainerView";
     public static final float PULL_MULTIPLIER = .02f;
     public static final float FLING_VELOCITY_MULTIPLIER = 1200f;
@@ -506,10 +507,6 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
         if (isSearching()) {
             mWorkManager.reset();
         }
-        // Remove the scrim drawing controller to:
-        // 1) clean up its reference to this class; and
-        // 2) avoid using the unfolded version of this class for the folded screen or vice-versa
-        mScrimView.setDrawingController(null);
     }
 
     /**