Merge "Maintain VPN type form the VpnProfile" into sc-dev