Merge "Modify g+ icon in Contact card to read from CP2 and stop color filtering" into ub-contactsdialer-g-dev