Merge "Fix StatusBarWifiView applying the wrong wifi icon" into qt-dev