Merge "Speculative fix for createBitmap crash"