I believe the train for this has already departed. It is very very unlikely that in next two decade state of surveillance, from either of its many pillars, slow down or stop. Lots of factors contributed to surveillance becoming as widespread as it is.