Merge "Move locale negotiation to ResourcesManager"