Merge "Improves SyncedDeviceConfig performance" into main