Merge "Revert "Refactors Search results into separate RV for Toast."" into tm-dev