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