Merge "Fix NPE when referencing DragResizeInputListener" into main