Merge "Use the correct drawable to badge user icon" into pi-dev
am: fd95ca6d2e

Change-Id: Ibd02faa61bd0e94039443d6242a706e4ed5b46b6