Merge "Fix pause/resume for AnimatorSet" into nyc-dev