Merge "animateNoDamage failed to remove from current frame list"