Merge "Remove unnecessary text styling for CredentialsScreenChip primary label so that primary text and secondary text are aligned " into main