Merge "[WifiSetup] Update Wi-Fi icon colors"