Merge "Use the SSID of the network in the no internet dialog" into pi-dev