Merge "Test session reset on VPN data stall"