Merge "Revert "Synchronize window config updates (7/n)"" into main