Merge "Rename shouldUseSolidColor to allowIcon" into main