VG-3979 - same logic for close icon, only adding if it's null, updating position otherwise.
VG-3979 - same logic for close icon, only adding if it's null, updating position otherwise.

voyagersearch/navigo,voyagersearch/navigo,voyagersearch/navigo