Merge "Switch Settings from IConnectivityManager to VpnManager." into sc-dev