Merge "Do not disconnect existing VPN if seamless handover fails"