Merge "Improve "Lost network stack" error message"