Merge "Fix unexpected ellipsize for long suggestion text." into nyc-dev