Merge "Anti-drift in RCC playback position" into jb-mr2-dev