Merge "Optimize filterByLanguage by caching locale objects" into oc-mr1-dev