Another update – both of these PRs are now merged and there are no outstanding bugs. I am now just working on a final PR to rename variables etc. like bookmarkWithReminder back to bookmark.
https://github.com/discourse/discourse/pull/9541
https://github.com/discourse/discourse/pull/9566