Merge "Attempting to fix SystemPaletteTests" into main