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