Fully split browse and search results output

Bug: 130646668
Test: Manual
Change-Id: Ie6b1b4e63c38973c21d25605410bb789da09ff44
2 files changed