Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev