Merge "Split the DownloadStateCallback class into two"