Merge "AudioFlinger: track metadata fix up" into sc-dev