Merge "ApiQueryWatchlist: Handle empty wltypes"