am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
  Work on issue #17656716: Unhandled exception in Window Manager