Merge change 4532 into donut

* changes:
  Fixes #1924909. When restoring managed dialogs, do exactly the same thing as when showing a dialog.