Merge "Match salt of WatchAction::show() and getWatchToken()"