[FXOS-149] better cleanup of event listener