Housing Action Plan 2.0 expected to return to City Council in December