Merge "Do not call stop() on the MediaSource if it hasn't been started." into ics-aah