Merge "BufferingSettings: define internal BufferingSettings API."