Merge "Change VPN failure notification to dialog" into nyc-dev