Merge "Use WatchedItemStore clearing in SpecialEditWatchlist"