Fix double status bar icons
am: 12124d7eca

Change-Id: Ib9208ba63774a65d6aac32f9af06abd2769dbd43