Merge "Only start tracing in the next frame" into sc-dev