Merge "Fix NPE for checking for whether animators should play together" into nyc-mr1-dev