Merge "Expand JankTracker" into nyc-dev