Merge pull request #6303 from TraceBullet/auto-adjust-window-size Fix Auto-Adjust Window Size option making the window too large