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

Change-Id: Ib0d9e51d289215d96525b68d0432b959e9b58f2f