Fix duplicate display of dangling images Upstream-commit: 29f809233e58547389da040859a8c286288c4d8a Component: engine