Merge "WLFilters: convert 'edit watchlist' button to new UX"