Merge "Fix ConcurrentModificationException in SliceBackgroundWorker"