Merge "Status bar: correctly register disable flags"