Merge "More tests for AnimatorSet"