Bring back "Order cluster token by last used" changes

We had to revert !57520 (merged)

This issue tracks reverting the revert in !58998 (merged) by addressing the underlying issue