Merge "Simplify state in View#draw(canvas, parent, drawingTime)"