Merge "Move VPN restriction check into setup dialog" into nyc-dev