Merge "Switch audio tracks at runtime" into jb-dev