Use SPA wait-to-finish conditionally (bug 1032316)