Fix issue where having a maximized window on a second monitor, then that...

Fix issue where having a maximized window on a second monitor, then that monitor gets removed which moves the maximized window to the main monitor, then restoring the maximized window would place it on a different viewport.  It should stay on the same viewport.