Merge "Vpn settings per vpn" into nyc-dev