Merge remote-tracking branch 'upstream/master' into master-build
* upstream/master: WinGui: Use hb_presets_read_file_json to read the UI presets file. This allows us to better handle version upgrades without resetting everything back to 0. WinGui: More Robust Queue Backup and Recovery. WinGui: Switch the GUI over to using JSON for the queue. (Note, this is not the same format as the CLI and thus cannot be imported. This may happen in the future) Please finish existing queue before installing new version.