Merge "Revert "Fix crash due to gesture monitor registered on virtual display"" into main

                }

                Display display = mDisplayManager.getDisplay(displayId);

                if (display == null) {

                    Log.w(TAG, "onDisplayAddSystemDecorations: can't find display");

                    return;

                }

                if (display.getType() != Display.TYPE_EXTERNAL) {

                    Log.w(TAG, "onDisplayAddSystemDecorations: display is not of TYPE_EXTERNAL");

                    Log.w(TAG, "createDisplayBackGestureHandler: can't find display");

                    return;

                }

                removeAndDisposeDisplayResource(displayId);