Merge "Full backup now saves getExternalFilesDir() content with the app data"