Merge "Fix stuck status bars." into jb-dev