Merge "Stop showing "No internet connection" when there is one." into ics-mr1