NYC plan would keep tobacco products out of sight