Merge "AudioTrack: Fix timestamp restore"