Merge "Simplify `list-style` property"