am d16419e1: Merge "Move away from gr_surface."

* commit 'd16419e176efa26f1760a52a9b57df96d070147a':
  Move away from gr_surface.