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

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