Merge "Add proper locks in the ProcessServiceRecord#onProcessUnfrozen" into main