Absolutely. Dumbledore pretty much said it would come back.

I would expect everything to come together in the end. The time-turner, the good luck potion, Mrs Figg, Neville & Luna's loyalty... Draco will be protectedby Dumbledore's death, Trelawney's gift will finally bloom (she has it, but her pride gets in the way), Petunia will make some surprising contribution, and Drako & Harry will become alies as they take Voldemort down.

The Lord of the Rings, after four books, took about a quarter of the last book to wrap up the happy ending. After seven books, Harry will need at least as much. Longbottoms will be cured, Ferenze will return to the forest, Hogwarts will be saved, and Harry & Ginny will ride off on their brooms into the glorious sunset.