Merge "Update Bitmap_Delegate following Change I0092fe44"