As far as I can tell, you are correct. They've basically just combined the previous End-of-Combat Phase Pile-In (if you were still locked in) and the Consolidation (if you had destroyed your opponents or they fled) into one Move, that's up to 3", ending closer to the nearest Enemy, regardless of whether you're still in Combat or not. Nice bit of streamlining, to my mind.
    • Like
    2