Merge "SF: Improve LayerInfo::calculateAverageFrameTime"