Merge "Minor changes to AudioTrack handling"