Merge "Moving ContactListItemView and dependent classes."