Merge "Fix bug with bad state in animators"