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