Fix maximized window
Merge remote-tracking branch 'upstream/pr/11691' into pr/11691

* upstream/pr/11691:
  Fix maximized window