I think the argument holds for religion too.

I can decide to not say offensive things in a store so as to not be kicked out. But I can't decide to change my faith to be allowed entry to the store, because faith doesn't work like that. You can't force religious belief. At most, I could pretend to change my professed religion. But my faith remains unchanged and unchangeable.

I don’t think it holds in general for all civil rights, but I do think this change in mindset underpins the increased protection of gender and sexual orientation vs 20 or 30 years ago. Even the typical verbiage has changed, from sexual preference to orientation.