Merge "Show Wifi 'Off' status properly just after boot"
am: 23482a54bb

Change-Id: Icc111b50f52f5ed801d63bedfac851ba5dcc99c1