Merge "Set underlying network as soon as VPN tries using the network" into main