Backport (7.8) - After saving in the properties window, the initialVariant (which should be selected on window close) is switched

If you open the properties window for example as variant 'X', then go to 'Y' then close the screen, the component gets loaded variant 'X' again.

However, if you after selecting 'Y' click on save, then after closing the window, the component gets loaded with 'Y' (or not reloaded)

Set to high as it results in quite confusing behavior