Fix double status bar icons am: 12124d7eca am: 447991c67a am: 9570287870
am: 5f3ddc7d6d

Change-Id: If4e6f50254c4a847a6579af6ae40a8d10f32aa90