Merge "Catch 0 width/height scaled Bitmap sizes"