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