Merge "Fix race condition in process observer" into main