Merge "Revert "Rename shouldUseSolidColor to allowIcon"" into main