Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev