Yep. All is well in the world again. The writers have confirmed as much, saying everything in the end-credits is basically canon for the film.