Merge "Improve ellipsize performance" into oc-mr1-dev