Merge "Merge "Fix double status bar icons" into nyc-dev am: 2b4e612b10 am: db2d30e1b9 am: 1a5a746fa3 am: 566f34f617" into nyc-mr1-dev-plus-aosp