Merge "Fix build break due to additional arg in Bitmap ctor"