Merge "Load aconfig default values into SettingsProvider." into main