(Sorry about the accidentally deleted message, I thought I had replied to something extremely old, and now I realize that it was new, it's just that there had been two new pages of posts in the meanwhile ).

Neither of the two. Only a minority care about these two aspects overall, as seen through history. And generally, there is a lot of overlap.

I define "control" as customization, more than privacy. No one cares (it seems) if the manufacturer collects all the information on your device every second, as long as there's "that checkbox to disable it" and a minimal assurance the checkbox actually works. i.e. no superfish-like scandals.

Few people will care further than that. And this subset of people basically includes all OSS-fanatics. Definitely not "disruption" fans; more like the opposite.