Merge "Fix gapless playback" into jb-dev