Merge "Fix race condition when collecting op callback."