Merge "MountService: unlink death notification when unregistering listeners"