Merge "allow for slow FrameMetricsListeners" into nyc-dev