am e3326143: am 2c76016c: Merge "Fix error where clips/matrices are...
am e3326143: am 2c76016c: Merge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev
* commit 'e3326143':
Fix error where clips/matrices are incorrectly transferred.