Merge "Add debug activity to export all data files as a zip"