Merge "Assume wifi is connected if the icon is says so" into sc-dev