Merge "[Provider model] Update the Wi-Fi icons in the Settings" into sc-dev