Merge commit 'd8681c9a93abb1a56eae9548d568bb9ae38419a1' * commit 'd8681c9a93abb1a56eae9548d568bb9ae38419a1': Revert "Deprecate showSearchIconAsBadge and icon search attrs"
Merge commit 'd8681c9a93abb1a56eae9548d568bb9ae38419a1' * commit 'd8681c9a93abb1a56eae9548d568bb9ae38419a1': Revert "Deprecate showSearchIconAsBadge and icon search attrs"