Merge "Stop getting locale config overrides" into main