Merge "Fix Wifi state not updated while connecting" into rvc-dev