Merge "Fix native crash when message queue quits." into klp-dev