Merge "Fix failed MediaSourcesLiveDataTest" into pi-car-dev