Merge "Fix WidgetsSearchBarControllerTest" into sc-dev