am db67d5b7: am ba6cdbfd: am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev

* commit 'db67d5b79ab2da6d8b8a1211b354687fb7930744':
  Notify settings URI change without a lock held