Merge "Fix animator sometimes not being ended when end() is called without start()'ing"