Merge commit 'b06ecc401160c5906fd1f4c85f61163bc2875200' * commit 'b06ecc401160c5906fd1f4c85f61163bc2875200': Remove old hack A/V sync hack that is no longer needed.
Merge commit 'b06ecc401160c5906fd1f4c85f61163bc2875200' * commit 'b06ecc401160c5906fd1f4c85f61163bc2875200': Remove old hack A/V sync hack that is no longer needed.