am 58c8db6b: Merge "Fix gapless playback" into jb-dev

* commit '58c8db6b7667db7a3bdb9b4bdd973091a5b0202f':
  Fix gapless playback