Merge "Fix remove animation running for HUN already seen in shade" into main