am a3c601e7: am 4883125b: Merge "do not dequeue from native window after we hit fatal error" into mnc-dev

* commit 'a3c601e70c8119a8c3dcc2026c4fb9875308b94c':
  do not dequeue from native window after we hit fatal error