[TIMOB-14949] Make sure searchbar comes back
Merge pull request #4644 from vishalduggal/timob-14949-31X

[TIMOB-14949] (3_1_X) Make sure searchbar comes back