When we rotate to show a screensaver, restore original rotation *before* closing the ScreenSaver window. And ensure closing the ScreenSaver *always* triggers a full update, no matter the settings. Fix #4621