Merge "Add test that calls cancel() from onAnimationEnd(Animator)"