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

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