Merge "Revert "Revert "Use the Coreographer's frame time for a more rel..."" into main