am fae77740: am f65d9756: Merge "Move away from gr_surface."

* commit 'fae77740c29b732e82b73a043f596470cd0ac0ed':
  Move away from gr_surface.