Merge "Stop unexpected truncation of suggestion items." into nyc-dev