Merge "Reduce unnecessary process lookup by pid" into main