am 534556ae: am 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '534556aef5ae22d522c5988d535b3b19b3742fd3':
  Work on issue #17656716: Unhandled exception in Window Manager