Merge "Bring account view up to spec (E2)" into ub-contactsdialer-f-dev