Merge "Revert "Fix missing ellipsis when just one character is truncated""