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