Merge "Include normal output track buffer depth in systrace"