Merge "Do not remove new animators when previous animator is ended" into main