Merge change 6867 into donut

* changes:
  CLOSE_SYSTEM_DIALOGS can't be protected.