Merge "Fix gapless SBR"