Merge "Improve ellipsize performance" into qt-dev