[Finishes #73644624] animation fix for infinite loop solutions

This is rather hacky, and is a reflection of how brittle our animation scheduling is.  Let me know if you can think of a better way.  Comments have explanation of what I'm doing.