Merge "ClientModeImpl: Add null check for IpClient in stopIpClient"