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