Merge "Pass surface timestamp to the capture result" into main