Merge "mediaplayer: add buffering settings API"