Fix possible race with batch updates in Files app.

ui/file_manager/file_manager/foreground/js/file_manager.js

Index: ui/file_manager/file_manager/foreground/js/file_manager.js
diff --git a/ui/file_manager/file_manager/foreground/js/file_manager.js b/ui/file_manager/file_manager/foreground/js/file_manager.js
index 82ffcf3c1ff9c7c54942c37db64aff26238b9834..38663e912abd33d16eadd48c0ee4d2b823e48fff 100644
--- a/ui/file_manager/file_manager/foreground/js/file_manager.js
+++ b/ui/file_manager/file_manager/foreground/js/file_manager.js
@@ -823,13 +823,20 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
     var dm = this.directoryModel_;
     dm.addEventListener('directory-changed',
                         this.onDirectoryChanged_.bind(this));
+
+    var listBeingUpdated = null;
     dm.addEventListener('begin-update-files', function() {
       self.currentList_.startBatchUpdates();
+      // Remember the list which was used when updating files started, so
+      // endBatchUpdates() is called on the same list.
+      listBeingUpdated = self.currentList_;
     });
     dm.addEventListener('end-update-files', function() {
       self.restoreItemBeingRenamed_();
-      self.currentList_.endBatchUpdates();
+      listBeingUpdated.endBatchUpdates();
+      listBeingUpdated = null;
     });
+
     dm.addEventListener('scan-started', this.onScanStarted_.bind(this));
     dm.addEventListener('scan-completed', this.onScanCompleted_.bind(this));
     dm.addEventListener('scan-failed', this.onScanCancelled_.bind(this));