Merge "Support seamless handover between VPN fds."