Merge "Correctly start tracing only where we are counting frames" into sc-dev