Merge "Implementing ContactNameColumns in PhoneLookup too"