am 840c6bfb: Merge "New switch to enable/disable all developer settings."

* commit '840c6bfb96201b5e187616c11fa1944b321a65c2':
  New switch to enable/disable all developer settings.