Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev