am 2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev

* commit '2ed42aea9c6fbca4bde52d647ff082b997b5968c':
  do not dequeue from native window after we hit fatal error -- DO NOT MERGE