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

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