Merge "Fix the animation glitch when NSSL adds and removes a HUN in the same frame." into sc-v2-dev