Merge "Fixed a bug where the statusbar could become empty" into nyc-dev am:...
Merge "Fixed a bug where the statusbar could become empty" into nyc-dev am: 319eecff am: bf79a1ec
am: cf45c11d
* commit 'cf45c11d':
Fixed a bug where the statusbar could become empty
Change-Id: I7183c1a6a5093f170dcb4920506426e68419332f