Merge "(bug 35723) Fix exception in API list=watchlist"