Merge "Fix broken SearchViewUiTest."