NXP-15287: Misc fix on note styles