Merge "Fix for heap buffer overflow in set sbr persistent buffer"