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

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