Merge "Fix gapless for deep buffers" into jb-dev