am 4fc3e841: Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev

* commit '4fc3e841358164a661c78f78bc617f5ac879aa35':
  Adapt frame rate instead of keeping that constant and tweaking bitrate