am 5665fde6: Merge "Start adding support for multiple record tracks" into jb-mr1-dev

* commit '5665fde6d4520c8e6cec81a4e1e9c86f1537f689':
  Start adding support for multiple record tracks