Merge "TIF: change documentation wording for onSetSurface()" into oc-dev