Merge "Style changes for Pointer fill color settings." into main