As the window state will have been initialized, read the current window state instead of assuming normal so changes are properly detected. Also note that the cause of #107314 has been fixed up-stream.
2721b937fb