Merge "Update logic on when raw contact picker dialog is shown" into ub-contactsdialer-h-dev