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

* commit 'b8d07d4b8dce11cfb293e4b0f2232ec860e9ccd5':
  Fix gapless playback