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