Merge "surface_control.h: Clarify callback documentation" into sc-dev