Merge "[Provider Model] Avoid running changes to WiFi level" into sc-v2-dev