am c514d64b: am d8c83fb8: am 88cae78f: am 89dd5f03: am c1d35148: am f2d0d9b0: Merge "Avoid the add-to-dictionary indicator from being clipped" into lmp-dev

* commit 'c514d64bff4c67cd28445385d90c067e8a666ebd':
  Avoid the add-to-dictionary indicator from being clipped