Merge "WatchAction: Add 'returnto' and 'returntoquery' to the login link"