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