diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
index b3b0b02..1bd0333 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
@@ -782,10 +782,6 @@
             }
         }
 
-        if (endTarget == NEW_TASK) {
-            SystemUiProxy.INSTANCE.get(mContext).onQuickSwitchToNewTask();
-        }
-
         if (endTarget == RECENTS || endTarget == HOME) {
             // Since we're now done quickStepping, we want to only listen for touch events
             // for the main orientation's nav bar, instead of multiple
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 0210a81..f5aaf1d 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -334,14 +334,13 @@
         }
     }
 
-    public void onQuickSwitchToNewTask() {
-        //TODO(b/150250451) add back in after big CL goes through
-//        if (mSystemUiProxy != null) {
-//            try {
-//                mSystemUiProxy.onQuickSwitchToNewTask();
-//            } catch (RemoteException e) {
-//                Log.w(TAG, "Failed call onQuickstepStarted", e);
-//            }
-//        }
+    public void onQuickSwitchToNewTask(int rotation) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.onQuickSwitchToNewTask(rotation);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call onQuickSwitchToNewTask with arg: " + rotation, e);
+            }
+        }
     }
 }
