Merge change I92a824fe

* changes:
  Immediately close the shade when the status bar is disabled.