Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev