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

Change-Id: Ia8572a2d8a0c73bb2fcdbfcc9c833ec8bc13d381