After leaving JGR, Grubb returns to Hendrick Motorsports