Merge pull request #21992 from colemanw/searchKitImageAndDefault