Merge "Pass extras to playFromMediaId" into pi-car-dev