Merge "Don't show the Wi-Fi icon when Wi-Fi is off" into main