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

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