City-County Council passes public safety plan