Merge "Don't reset country code once it is persisted" into klp-dev