Merge "End the trace section while the surface has destroyed" into sc-dev