Merge \"Add margins to the system icons when the user avatar is gone.\" into nyc-mr1-dev
am: 3c75a0380d

Change-Id: I9a92b0501fe6cbd3a910f21ff89e893ee5d77c67