Merge "Fix potential for dead binders when calling callbacks"