Bug 826991 - Store download state and end time in an annotation (avoid I/O for new history downloads), part 2. r=mak