am f65d9756: Merge "Move away from gr_surface."

* commit 'f65d97567c0d857458a1978085af4518750f51b6':
  Move away from gr_surface.