Merge "Only add a new picker dialog if there isn't one already" into ub-contactsdialer-h-dev am: 4b87c9c0b8
am: 1607f04b24

Change-Id: If885ef1476cc2c50a2a2b11f6f8bbf60a72e8a9b