Rearrange save snapshot code from onStop to back-menu (hotfix)