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

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