resolve merge conflicts of 5c229885fc to ub-launcher3-qt-future-dev

Bug: None
Test: I solemnly swear I tested this conflict resolution.

Change-Id: I41247ff46308b72158731e4a47466533d42e67c6

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

@@ -380,6 +380,10 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe
             TaskView runningTaskView = recentsView.getRunningTaskView();
             if (runningTaskView == null) {
                 runningTaskView = recentsView.getCurrentPageTaskView();
+                if (runningTaskView == null) {
+                    // There are no task views in LockTask mode when Overview is enabled.
+                    return;
+                }
             }
             TimeInterpolator oldInterpolator = translateY.getInterpolator();
             Rect fallbackInsets = launcher.getDeviceProfile().getInsets();