[qtscenegraph-adaptation] Merge fixes from upstream