am c69acaef: Merge "New global setting for developer options."

* commit 'c69acaef0b31af922931461c11f075e436642fef':
  New global setting for developer options.