Merge "Reworking contacts list adapters for the new CompositeCursorAdapter API"