Merge "Rename icons dir to match resources from common (1/2)" into ub-contactsdialer-g-dev