Merge "Start adding support for multiple record tracks" into jb-mr1-dev