Merge "Wifi: Country code during Wifi scan only mode"