Merge "Fix array out of bounds access in JankTracker" into nyc-dev