Merge "Only set locale in config for updating locale" into tm-qpr-dev