Merge "Previous change broke A/V sync, this is a better change to eliminate negative media positions."