Merge "Modify SettingsLib for partial connectivity"