Merge pull request #21457 from colemanw/searchDisplayAfformDelete