* commit '03e173edce42a5ae0de8a7718330d83664a84a9e': More work on issue #17656716: Unhandled exception in Window Manager