Merge "AudioTrackShared cleanup"