am 97b4abf2: Merge "Adjust bit rate based on resolution" into jb-mr2-dev

* commit '97b4abf2f0521a72db7b01de3a88d43be249d611':
  Adjust bit rate based on resolution