Merge "Fixing potential crash when trying to create 0x0 bitmaps"