Merge "Fix position when restoring streaming audio track"