CB-7018 Fix setButtonPlumbedToJs never un-listening