Merge "Fix text color contrast issue on Caption size and style screen" into main