Make detaching listener happen all the time in finishOperation

Author: crokita

lib/js/src/manager/screen/choiceset/_PreloadPresentChoicesOperation.js

@@ -703,6 +703,9 @@ class _PreloadPresentChoicesOperation extends _Task {
             this._completionListener(this._loadedCells, success);
         }
 
+        // detach the OnKeyboardInput listener at the end
+        this._lifecycleManager.removeRpcListener(FunctionID.OnKeyboardInput, this._keyboardRpcListener);
+
         if (this._lifecycleManager === null) {
             console.error('PresentChoiceSetOperation: LifecycleManager is null');
             this._currentState = _PreloadPresentChoicesOperationState.FINISHING;
@@ -716,8 +719,6 @@ class _PreloadPresentChoicesOperation extends _Task {
             const setGlobalProperties = new SetGlobalProperties()
                 .setKeyboardProperties(this._originalKeyboardProperties);
 
-            // detach the OnKeyboardInput listener at the end
-            this._lifecycleManager.removeRpcListener(FunctionID.OnKeyboardInput, this._keyboardRpcListener);
             const response = await this._lifecycleManager.sendRpcResolve(setGlobalProperties);
 
             if (response.getSuccess()) {