Merge pull request #12744 from nlebeck/settingshandler-split-2 Split `SettingsHandler` into separate reader and writer classes