Merge "Merge "Fixed a bug where the statusbar could become empty" into nyc-dev...
Merge "Merge "Fixed a bug where the statusbar could become empty" into nyc-dev am: 319eecff am: 619a5a28" into nyc-mr1-dev-plus-aosp
am: 98f64d5c
* commit '98f64d5c':
Change-Id: If08c9a0029e48e6438936b0d6020260145c1f229