Yes, both merit and need-based scholarships and grants can be used to take a proportionate 529 non-qualified distribution without incurring the 10% penalty. Where did you get the understanding that this only applies to merit scholarships?
(P.S. Merit scholarships are a kind of financial aid.)