Merge "Watchlist preferences: Disallow zero value for days/limit"