Merge "Corrects long name ellipsize for quick contact." into klp-dev