Merge "Create unit test for the VpnInfoPreference" into sc-dev