Merge "Fix FrameMetricsObserver crash" into nyc-mr1-dev