Merge "Make SettingsProvider able to restoreAnyVersion, but only for supported keys"