am d19068a7: am 413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev

* commit 'd19068a7d28d129f5a1a1be478e972b40cea04eb':
  Fix free after use with createFromBitmapResource