Merge "SF: trace the render rate of an app" into main