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