am 0dc2b81c: Merge "Cleanup internal status bar APIs." into jb-mr1-dev

* commit '0dc2b81ce1400ae23faa5cc386caeef235856307':
  Cleanup internal status bar APIs.