am 658e935b: am c0bc3369: Merge "Fix more suggestions text width calculation" into jb-mr1-dev

* commit '658e935ba1d7763854b2df87d90f7d374a81c7a1':
  Fix more suggestions text width calculation