Merge "Fix DeathRecipient not work problem for UnsolicitedEventListener"