Merge "[1/3] Refactor animator creation to prepare for the new spring." into main