am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '9cf01b63cb0023aec0e05b1ce050ff572532b876':
  More work on issue #17656716: Unhandled exception in Window Manager