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