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

* commit 'fa3df4ad35da6528ab5620d4f596c60d8cd99110':
  Fix adaptive frame rate handling to be non-adaptive unless specified through