Merge \"Fix NPE for checking for whether animators should play together\" into nyc-mr1-dev
am: 7f9c189f06

Change-Id: I3ea0e652dd39dfffe279b4c2c0bb19d362eb91af