Cherry pick @grindhold's hand cursor fix