[System] Improvements to #15818 fix

- fix failing unit test
- don't call SettingsSaving on Reset()