Merge "Fix QS/status bar BT state"