Merge "Move action.watch to a more suitable place and expose updateWatchLink method...