Merge "Ignore width of trailing whitespace for computing ellipsis" into lmp-dev