Merge "Show Wifi 'Off' status properly just after boot"