Merge "[Provider Model] Fix WiFi reconfiguration issue" into tm-dev