Merge "Add test to check socket close state after vpn connects"