Merge \\"Add margins to the system icons when the user avatar is gone.\\" into...
Merge \\"Add margins to the system icons when the user avatar is gone.\\" into nyc-mr1-dev am: 3c75a038
am: c0c4affe
Change-Id: I4738a03ea901be7df95a953b887b0660f20d7d5b