Merge "Cancelling scroll indicator animation during All Apps transition"
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index eacafde..06e0185 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1744,6 +1744,7 @@
     @Override
     public void onLauncherTransitionStart(Launcher l, boolean animated, boolean toWorkspace) {
         mIsSwitchingState = true;
+        cancelScrollingIndicatorAnimations();
     }
 
     @Override