am d294bf4b: am 3a555c19: Merge "Increase polling frequency again temporarily to fix A/V issues" into jb-mr1-dev

* commit 'd294bf4b9d1d57aedab83b276ff5ca60c2f71488':
  Increase polling frequency again temporarily to fix A/V issues