Yup, but I can see both of those things changing due to many factors.
Given that Tessa Thompson just said of Valkyrie at SDCC, "First of all, as a new king, she needs to find her queen. So that will be the first order of business," with the director of the film standing on stage with her...
I really don't see them undoing what was just done.