There's a check in #8269 that we've finished all SP updates before moving on to zone updates. But it isn't quite right because it doesn't account for cases where we're unable to proceed with an SP update for some reason. I hope that fixing this will be easy after #8284 (because we'll avoid proceeding if this step returns any "events we're waiting for").