Merge "Track slowest frames" into nyc-dev