Merge "More state cleanup in View#draw"