[qtscenegraph-adaptation] Merge changes from upstream