Merge "Fix AnimatorSet duration issue"