Merge "Fix race condition in AwesomePlayer"