Merge "Enlarge mLast4FrameMetricsInfos from 4 to 6 entries" into main