Merge "media: Add track ID format key" into nyc-dev