Allow action=watch to actually work

Change Ide6eec9c broke action=watch: Due to the inherited watch
function, it's now claiming that action=watch has no parameters in
Firefox.

The root cause is the same as in bug 44063, as is the fix.

Bug: 65096
Change-Id: Ie69dbd19c7f5ff140217093ebd14f44553a11edd