Native Android views cannot be removed when added through QWindow::fromWinId

I am able to add a native Android view through the QWindow::fromWinId api, but it will not be removed when deleting the window. Looking into the androidjnimain.cpp it appears to be that the insertNativeView function does not insert the id into the m_surfaces list. If the window id is not in the m_surfaces list, destroySurface will return before calling the jni method to remove the view.