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