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

* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager