Merge "Improve ellipsize performance" into rvc-dev