Merge "Revert "trace-ipc: Don't hold procLock while calling out."" into main