Merge changes from topic "am-99fcacb9-83c9-4450-9a4c-50857df20a29" into ub-launcher3-master

* changes:
  [automerger] Ensure that animaiton.end() is properly dispatched am: 73954df645
  Ensure that animaiton.end() is properly dispatched
diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 29399142..e346310 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -118,6 +118,7 @@
                 finish();
             } else if (mFinished) {
                 // Animation callback was already finished, skip the animation.
+                mAnimator.start();
                 mAnimator.end();
             } else {
                 // Start the animation