Merge "Smooth out AwesomePlayer"