Merge "Support surface only instrumentation" into sc-v2-dev