SurfaceView Cleanup (1/n): Breakup updateSurface()

This has become a mega function, the number of variables
and levels of indentation is increasingly difficult to read.
This is a simple abstraction of one large chunk.

Test: Existing tests pass
Change-Id: If20185ce640802173ccd53c84b1947b011f379ad