Merge "Cleanup watchlist preference usage"