Merge "Add ConnectivitySettingsManager"