Merge "Fix Animator cancel() behavior"