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

* commit '962e3e831516688824fec334c5ddcfd4f3d13f44':
  More work on issue #17656716: Unhandled exception in Window Manager