Merge "Fix track selection code in AwesomePlayer" into jb-dev