Merge "Wifi: Reset country code during cellular loss" into sc-dev