Merge "Fix an issue with the wifi status bar icon appearing when it shouldn't." into main