Cat Grant is Back! Calista Flockhart to Return to Supergirl