DF-4918 updated AnimationSystem logic according review