Merge "Update Settings homepage color role mappings" into main