Merge "onDrawBitmap* virtual are no longer called"