Merge "Use selected photo ID as the "photo to display" lookup parameter" into ub-contactsdialer-a-dev