Merge "Fix status bar disabling." into jb-mr1-dev