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