Merge "Fix reset() to zero slowFrameCounts" into nyc-dev