Merge remote-tracking branch 'origin/feature/files-action-in-search-mode' into feature/files-action-in-search-mode

# Conflicts:
#	app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -259,6 +259,7 @@ public class FileDisplayActivity extends FileActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
         Log_OC.v(TAG, "onCreate() start");
         // Set the default theme to replace the launch screen theme.
         setTheme(R.style.Theme_ownCloud_Toolbar_Drawer);
@@ -633,7 +634,7 @@ public class FileDisplayActivity extends FileActivity
 
     private OCFileListFragment getOCFileListFragmentFromFile() {
         final Fragment leftFragment = getLeftFragment();
-        OCFileListFragment listOfFiles;
+        OCFileListFragment listOfFiles = null;
         if (leftFragment instanceof OCFileListFragment) {
             listOfFiles = (OCFileListFragment) leftFragment;
         } else {