MOB-2403 enterCanceled flag removed, listener changed