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