New York City to Consolidate Housing Subsidy Programs