Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"