Merge "Set state to CLOSED when unfolding with a HUN visible" into main