[#32077] Smart Search toolbar broken in Hathor.
Merge pull request #2071 from Achal-Aggarwal/fix-32077

[#32077] Smart Search toolbar broken in Hathor.