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