Merge "Improve ellipsize performance" into rvc-qpr-dev