Merge pull request #22321 from colemanw/searchAdminPagerConfigFix