Some DrawingSurface optimizations

Change-Id: If9374ba9ff2a105952410320aa71510719054878