Merge "Revert "Speculative fix for createBitmap crash""