Merge "Fix AnimatorSet cancellation issues"