Merge "Simplify watchlist edit mode handling"