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

Change-Id: I707e1f8457e826d2d5b83ccc21668e5a786b28eb