NBC: Starbucks will stop charging extra for nondairy milk