Merge "Update icons and strings for always-on VPN info"