Merge "Fix native crash" into jb-mr1-dev