Merge "Allow disconnecting always-on VPNs" into nyc-dev