McNeil Consumer to make marketing splash as OTC brands return to market