Merge "Fix for native crash on image decode OOM" into jb-mr1-dev