Merge "Support seamless handover between VPN fds." into pi-dev