Merge "Glop drawBitmaps, drawPatches"