Bug 1068619 - [v2.2] [v2.1] Investigate test_browser_search failure
Merge pull request #24389 from viorelaioia/bug_1068619_v2.1_

Bug 1068619 - [v2.2] [v2.1] Investigate test_browser_search failure