Fix double status bar icons
am: 12124d7eca

Change-Id: Ief00496f19d2e249129023a03cd9f53d76fa7bf8