Merge "Revert "Watchlist grouping (not ready for review)""