Merge "Don't attempt to seek audio and video separately." into jb-mr1-dev