Merge "Create a pixelref wrapper for reused bitmaps" into klp-dev