Merge "Fix callback registration during merging in same-process"