Merge "ethernet: unregister NetworkAgent before stopping IpClient"