Merge "Fix binder death and disconnection." into main