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