Merge "Extend timeout of Media Browse loading" into pi-car-dev