Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev