Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev