Merge "Fix Animators pausing on a wrong Window" into nyc-mr1-dev