Merge "Fix WiFi + "x" stil visible" into rvc-d1-dev