Merge "Move away from gr_surface."