Merge "Ellipsize texts in contacts list correctly"