Merge ""Guest" icon should be a default user icon." into pi-dev am: e44eb9201f
am: fdb30f53c5

Change-Id: I04ff14e8622d274c24e2ed34f51ac297878399bc