Merge "Handle onBindingDied in notification manager"