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