Merge "Fix crash when decoding bitmap" into jb-dev