Merge "Removes complication in onMediaDataLoaded if hasActiveMedia is false." into tm-qpr-dev