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