Merge "Improve ellipsize performance" into pi-dev