Merge "Fix binder proxy death notice tracking"