Merge "Pass sampling or nothing to surface.draw" into sc-dev