Merge "Fix bug in registering death listener" into rvc-dev