move merge live photos up, so that mFilesAll is same as mFiles

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -702,9 +702,9 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             }
             sortOrder = preferences.getSortOrderByFolder(directory);
             mFiles = sortOrder.sortCloudFiles(mFiles);
+            mergeOCFilesForLivePhoto();
             mFilesAll.clear();
             mFilesAll.addAll(mFiles);
-            mergeOCFilesForLivePhoto();
             currentDirectory = directory;
         } else {
             mFiles.clear();