I think the real battle is in Judicial reforms. Honestly we are at a stage where the face recpgnition technology is just too easy to deploy. [1, 2]
There are also several legitimate use cases, e.g. Amber alerts, Public right to record, etc. The society can delay dealing with technology for only so long. Over the next decade we will see huge adoption of Autonomous cars, robots, cheap drones essentially "Mainstreaming" of surveillance technology. At this point the legal system would have to decide a sane framework to resolve the challenges posed by technology. However given the paralysis in Washington, and inability to deal with even the most basic questions of algorithms and law (No-fly lists being the prime example) I am not too hopeful.
[1] https://github.com/search?q=topic%3Aface-recognition&type=Re...