Merge "AudioFlinger: Offload track transition fix"