Merge "[Provider Model] Fix WiFi SSID disappear issue"