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

* commit 'b5000cb82b8abd301e6e7b3b3f6d71e219b56f1c':
  In Email-lookup query, prefer visible over invisible contacts