Merge "Watchlist: Fix form and preference overriding"