Makeup and tattoo swatch indicator revert to first swatch instead of selected

When applying any item in CAS, a green indicator appears around the swatch of the selected item. Ever since the update I've noticed that whenever I apply makeup in ANY category (eyes, eyeliner, cheeks, lips and facepaint) that the green indicator would work correctly, but once I click away the swatch and sliders tab and reopen it again, the indicator would reappear on the first swatch of the item even if that was not the swatch that I selected. I've noticed this to be the case with all categories of tattoos as well, which leads me to believe this issue might be due to the newly added tattoo opacity sliders, as this glitch is only present with CAS items that have sliders. I've included some photos that showcase the indicator on the correct swatch when it was just chosen in the before, and clearly on the wrong swatch in the after photos. This is a really specific and small issue but I hope someone else sees what I see.

Edit By Crinrict: Adjusted Title to better reflect the issue