Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev