Merge "fix a race condition of MediaPlayerServce::Client::mClient"