Merge "VPN reconnection fails after manually disabling VPN"