Merge "audioflinger: fix offload track transition" into klp-dev