Merge "Support QuickContacts For Extended Directories" into klp-dev