Merge "Cleanup internal status bar APIs." into jb-mr1-dev