Merge "Fix alphabetical headers for phone-all contacts"