Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev