Merge "Unhide APIs for timed text and multiple audio track switch APIs" into jb-dev