Merge "Align transaction trace timestamps with wm and sf trace" into rvc-dev