Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev