Closes #3166. Refines the executor switchover process. Switches at the end of the block and after loading a snapshot. See the issue for more details.

Changelog: refactor