Merge "mediaplayer: optimize buffer queue management" into lmp-dev