Merge "set Default country code to be persistent" into sc-dev