org-timer.el: Merge API for the two timers