Merge changes from topic "am-125d8586-dd81-455b-b3e8-107829f04796" into ub-launcher3-master

* changes:
  [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c am: 556a97d9d6
  [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c
  Set mState = mCurrentStableState in onAnimationCancel