Merge "Don't crash trying to disable lockdown VPN" into nyc-dev