Bug 1054166: Mirror Add/RemoveListener in Add/RemoveDirectListener r=roc a=abillings