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