Merge "bitmaps and pixelrefs no longer need lock/unlock"