Merge "Don't crash on Canvas.drawPicture()"