Merge "Split the DownloadStateCallback class into two" into pi-dev