am 91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-dev

* commit '91695a0cdc0aaab3d3f939d9adb8855938b4f69d':
  Anti-drift in RCC playback position