fix a bug where an exists watch gets incorrectly disabled when it's still valid

RB=288471
R=osumampo,si-dev,dhoa,zzhu
A=dhoa,zzhu