Merge "Adjust bit rate based on resolution" into jb-mr2-dev