Merge "do not dequeue from native window after we hit fatal error" into mnc-dev