On-going hl switch / editing / draft interactions

- Wait until we have a token to finish on-going edits
- Make sure to reset the on-going highlight switch
- No need to cancel on route change now that draft discarding does that