Merge "Fix color picker apply button" into main