Merge "Add ConnectivitySettingsManagerTest" into sc-dev