Merge "Revert "Set mState = mCurrentStableState in onAnimationCancel()"" into tm-dev