Merge "Fix possible leak in bitmap decoding." into jb-dev