Merge "VPN settings: update strings for always-on VPN"