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