Merge "Fix styling for legacy light themed lists"