Merge "Update mw.api.watch according to new Watch API"