Merge "BufferingSettings: hook up internal BufferingSettings API."