Re-introduce toggle-call for non-splash state, refs #486