Merge "VPN: Explicitly handle IAE from updating underlying network" into main