Merge "Fix bug 7250807 Ellipsizing is broken" into jb-mr1-dev