Merge \"On phones, don\'t show the avatar icon when it is the only user.\" into nyc-mr1-dev
am: 9ee8f8066c

Change-Id: I2b2a816174a08c2e83fb82939c1205245794473d