Merge "trace: Fix no PID issue for trace marker"