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

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