am c6a957fc: am b7706712: Merge "Fix gapless for deep buffers" into jb-dev

* commit 'c6a957fca84ee2a673a3b7363b481afcf4b7e784':
  Fix gapless for deep buffers