Merge "Revert "Set mState = mCurrentStableState in onAnimationCancel"" into ub-launcher3-edmonton