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

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