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