am 23a5f44c: Merge "Fix native crash when message queue quits." into klp-dev

* commit '23a5f44c5a306b4a70821722a697da55cc3c5db8':
  Fix native crash when message queue quits.