CiviMail: Save & Continue should remember the proper step to return to

Save & Continue Later should remember which step it was on when you clicked and return you to that step when you Continue.

We should also handle this for Search based mailings.