feat(watch): accept watch callback return cleanup function

feat(watch): accept watch callback return cleanup function #12962