Merge "Fix the contact list. For now show all contacts"