Merge "Refactoring ContactEntryListFragment/Adapter"