Merge "Fix problem with Animators pausing the wrong Window."