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