am fa3df4ad: Merge "Fix adaptive frame rate handling to be non-adaptive unless...
am fa3df4ad: Merge "Fix adaptive frame rate handling to be non-adaptive unless specified through" into jb-mr2-dev
* commit 'fa3df4ad':
Fix adaptive frame rate handling to be non-adaptive unless specified through