Merge "Revert "Fix HUNs re-showing after shade closes"" into main