NYPD reaches new deal in surveillance lawsuit