* commit '796d6eced1e23217914e639da45d9371baf8a5b0': More work on issue #17656716: Unhandled exception in Window Manager