Merge "Remove flag of country code update during setup wizard, and only enable updating country code from scan results for generic case" into udc-dev