Use existing wait-to-finish url (bug 1036974)

I feel like this can just be ``if settings.SPA_ENABLE``. Otherwise, we should maybe add a helper like ``if utils.in_spa()``