Merge "Refactor Watchlist code so mobile can be more consistent"