Messi returns after kidney stone treatment