Merge "Don't crash when scaling Bitmaps with private Bitmap.Configs" into jb-dev