diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 8d03c5d09f..3334b32b45 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -1055,19 +1055,12 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer
     /** Receives animation progress from sysui process. */
     private void initRemotelyCalculatedUnfoldAnimation(UnfoldTransitionConfig config) {
 
-        Handler handler;
-        try {
-            handler = getMainThreadHandler();
-        } catch (Throwable t) {
-            handler = new Handler(Looper.getMainLooper());
-        }
-
         RemoteUnfoldSharedComponent unfoldComponent =
                 UnfoldTransitionFactory.createRemoteUnfoldSharedComponent(
                         /* context= */ this,
                         config,
                         getMainExecutor(),
-                        handler,
+                        getMainThreadHandler(),
                         /* backgroundExecutor= */ UI_HELPER_EXECUTOR,
                         /* bgHandler= */ UI_HELPER_EXECUTOR.getHandler(),
                         /* tracingTagPrefix= */ "launcher",
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index 0359e22b0a..e991a0bdee 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -28,6 +28,8 @@ import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.window.OnBackInvokedDispatcher;
 
@@ -392,6 +394,15 @@ public abstract class BaseActivity extends ComponentActivity implements Activity
         mEventCallbacks[event].add(callback);
     }
 
+    @Override
+    public Handler getMainThreadHandler() {
+        try {
+            return new Handler(Looper.getMainLooper());
+        } catch (Throwable t) {
+            return super.getMainThreadHandler();
+        }
+    }
+
     /** Removes a previously added callback */
     public void removeEventCallback(@ActivityEvent int event, Runnable callback) {
         mEventCallbacks[event].remove(callback);