Merge "Properly protect mFrameMetricsReporter" into sc-dev