Merge "In Email-lookup query, prefer visible over invisible contacts" into ics-mr1