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