Merge "Fix WiFi show "Not connected" always issue" into sc-dev