Merge "healthd: `GRSurface` now is a class."