Merge "Adjust Checkbox component to align with UX specs"