Merge "Lock ProcessRecord.baseProcessTracker with proper locks"