Fix persistent screen state to recognize FullScreen separately from Maximized.

This is the same change as !8 (merged), but against the 1.8 branch. Although the code can be cleaned up further, I was trying to minimize review effort, and clean up could be done on master at a later time.