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