Merge "ViewPropertyAnimator cancels prior animations"