Merge "Ensure Animators and AnimatorSets run together are sync'd"