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