Fix spawner behaviour on failing controller activation or deactivation (backport #1941)

Fix spawner behaviour on failing controller activation or deactivation (backport #1941) #652