Use SPA wait-to-finish if SPA_ENABLED is True (WiP)

:circus_tent: :fire: :dancers: :dancer: :dancers: :fire: