am 5f8cbbe4: am fafa242a: am b7fe953a: Merge "Fix bug 7250807 Ellipsizing is broken" into jb-mr1-dev

* commit '5f8cbbe4dec785101591804744c9f3408b407a6e':
  Fix bug 7250807 Ellipsizing is broken