Hi-Res Fix On/Off state not saved by Defaults

[vxarg]

With the new update, enabling the Hi-Res Fix changed from an on/off toggle to an "accordion".

The Defaults page under settings doesn't seem to remember the on/off state of Hi-Res fix.
I open and close it and click view changes and and it says "no changes".

So I can only tweak the default settings for Hi-Res Fix (steps, denoising, etc) but can't have Hi-Res Fix turned on by default.

Originally posted by @vxarg in #12751 (reply in thread)

This new update also breaks some extensions such as the Queue Extension (https://github.com/Kryptortio/SDAtom-WebUi-client-queue-ext).

EDIT:
The webui-state extension (https://github.com/ilian6806/stable-diffusion-webui-state) also fails to save the On/Off state of Hires Fix.

[PHannan80]

In addition to the accordion replacing the on/off toggle, I don't seem to be able to turn off hires fix after I have used it, without restarting the server and reopening the webui.
In the attached screen shot, trying to generate an image, after having used the hires fix for a previous image, I am now stuck with the options, even though I have selected "None" in the upscaler.
This still happens even if the accordion is in a collapsed state.

If I reduce Hires steps to 0, it will perform the hires steps to match the sampling steps.
Reduce it to 1 and it ruins the image (from normal output).

Request an on/off toggle within the accordion (similar to ADetailer or ModelKeyword scripts shown bottom corner of image)
or
Please let me know where I have gone wrong and which setting I need to turn back on (or off).

Apologies for the dodgy marking with my mouse.

EDIT: Have just noted that with "None" selected in the Hires fix, the generation process completes the initial steps, and then doesn't process the additional Hires steps.
Although this in effect achieves the outcome of not performing those additional steps, the generated image is stuck at the size that the Hires fix wanted to start with (640x448 in this case), to bring it up to the size I asked for.