Merge "Fix HUN re-show after closing shade" into main