Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev