Merge "[MediaContent] Fixed possible deadlock issues of async methods."