Merge "Ellipsize Preference summaries" into nyc-dev