Merge "Set UMO settings icon to dynamic color on communal" into main