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

* commit 'fc42e16d96b7e1b18b573f40df1319c56f8ab933':
  Fix track selection code in AwesomePlayer