Merge ruih/master into cbl_master/plugfest36. We need the changes in order to make DLNA seeking to work properly.

Merge ruih/master into cbl_master/plugfest36. We need the changes in order to make DLNA seeking to work properly.