Merge "ApiQuerySiteInfo: Avoid extra getConfig() calls"