Merge "Keep polling for IPv6 address on EADDRNOTAVAIL"