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

* commit 'c0bc3369555435c677804b652b5fb36faf3602e5':
  Fix more suggestions text width calculation