Merge "Update the WiFi icons when there is no internet" into sc-dev