Solari: Fix normal maps and support two-channel maps (#24880)