Merge "Revert "ClientModeImpl: Add more logging for stopIpClient"" into sc-dev