Merge "Fully split browse and search results output" into pi-car-dev