Merge "Fix double status bar icons" into nyc-dev
am: 2b4e612b10

Change-Id: Ic50aea16f2c5dd14c56dac581f9780e49626ddb5