am beb82576: am 9eea72ab: (-s ours) am d223d9bb: am 7ba8b9f8: am fc26577c: am 698ff79c: am 27362395: (-s ours) am 2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev

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