Fixed minor bug on removeListeners in EnabledComponentBasedOnWidget