Add wait-to-finish for SPA (bug 1024451)