Merge "Fix surface tracing thread sync issues"