Merge "Status bar: Keep disabled state per user." into jb-mr1-dev