Project explorer remember incorrectly the last expand/collapsed state nodes on QBS projects

Since at least version 14 of QtCreator a very strange behaviour occurs when using complex qbs projects.
Expanded/collapsed nodes in projectExplorer do not retain their state when switching sessions or reloading the main qbs.

Steps to reproduce the problem
01) Make sure that the 'default' session is empty
02) Create a new session, e.g. 'test-qbs' and load the project
03) Expand the node "app_and_lib\libraries-2\lib2" (VIEW IMAGE STEP-03.png)
04) Change to "default" session
05) Change to "test-qbs" session
06) RESULT: all nodes are expanded. (VIEW IMAGE STEP-06.png)

07) Collapse the "Libraries-1" node (VIEW IMAGE STEP-07.png)
08) Change to "default" session
09) Change to "test-qbs" session
10) RESULT: all nodes are collapsed (VIEW IMAGE STEP-10.png)

In my real project, there are near of 100 qbs files: modules, apps and librarires.
This behaviour of QtCreator makes it impossible to work smoothly.

To solve this problem I have to modify 3 files in the projectExplorer plugin and recompile QtCreator.
The modifications are specified in the attached file "patch.txt".

I think the problem originated with this modification
https://bugreports.qt.io/browse/QTCREATORBUG-29201