Merge "Optimize locale negotiation when there's only one locale"