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