Merge branch 'stable' into master-merge

diff --cc Content.Client/Storage/StorageBoundUserInterface.cs
index 8cb415dead5db8a22c821d803b277c5494b225c2,16545c357847535192f6e849744b2592e954f1b0..c2f358de2a9d37256124a41f0ec4159d170029a5
--- 1/Content.Client/Storage/StorageBoundUserInterface.cs
--- 2/Content.Client/Storage/StorageBoundUserInterface.cs
+++ b/Content.Client/Storage/StorageBoundUserInterface.cs
@@@ -92,5 -92,12 +92,4 @@@ public sealed class StorageBoundUserInt
          Show();
          LayoutContainer.SetPosition(_window, position);
      }
 -
 -    public void ReOpen()
 -    {
 -        _window?.Orphan();
 -        _window = null;
 -        Open();
 -    }
  }
--