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

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