More state cleanup in View#draw

bug:20254728

Change-Id: I988077aac59165dd1fcb3ebbcd5abded586256b5
1 file changed