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

Change-Id: I52d32ec39c5f6d8923b08d05d864c7f010b3562f