Merge "Extract the drawing logic from StartingSurfaceDrawer."