Merge "Add margins to the system icons when the user avatar is gone." into nyc-mr1-dev