Merge "Handle getNetworkWatchlistConfigHash() without config case" into pi-dev