Fix double status bar icons
am: c6fe61c59c

Change-Id: I5d881904102d23f7aa0f593fcde496a2865bef29