Merge "(bug 31313) Clarify watchlist preference messages"