Merge "Stop switching to main contacts list unnecessarily." into ub-contactsdialer-h-dev