Merge "Revert "Output additional trace points for each frame""